diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:32:09 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-01-25 09:24:31 +1300 |
| commit | ea1de3fcdc40d2060bb6d13775005eadd624e767 (patch) | |
| tree | 277129a182d09d7996dabf52ce1fbe3f247d28aa /xkb/xkbActions.c | |
| parent | 0f2d297dedeff8bd227df4c498cc668b0e902344 (diff) | |
xkb: remove _XkbTyped*alloc
Please no extension-specific macros for memory allocation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'xkb/xkbActions.c')
| -rw-r--r-- | xkb/xkbActions.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index b0ab427b6..75f3c722e 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1016,7 +1016,7 @@ register int i; if (xkbi->szFilters==0) { xkbi->szFilters = 4; - xkbi->filters = _XkbTypedCalloc(xkbi->szFilters,XkbFilterRec); + xkbi->filters = xcalloc(xkbi->szFilters, sizeof(XkbFilterRec)); /* 6/21/93 (ef) -- XXX! deal with allocation failure */ } for (i=0;i<xkbi->szFilters;i++) { @@ -1026,9 +1026,8 @@ register int i; } } xkbi->szFilters*=2; - xkbi->filters= _XkbTypedRealloc(xkbi->filters, - xkbi->szFilters, - XkbFilterRec); + xkbi->filters= xrealloc(xkbi->filters, + xkbi->szFilters * sizeof(XkbFilterRec)); /* 6/21/93 (ef) -- XXX! deal with allocation failure */ bzero(&xkbi->filters[xkbi->szFilters/2], (xkbi->szFilters/2)*sizeof(XkbFilterRec)); |