diff options
| author | jbj <devnull@localhost> | 1999-04-08 20:53:45 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-04-08 20:53:45 +0000 |
| commit | 8dfb93f84f7862cb820b89718c8b2dcc3bba4fe2 (patch) | |
| tree | 20874bcbbf2f5e740ace145cbad3dc0de9241814 /rpmio | |
| parent | 200d5128061648a19dac9c0784d95be15cad7803 (diff) | |
| download | rpm-8dfb93f84f7862cb820b89718c8b2dcc3bba4fe2.tar.gz rpm-8dfb93f84f7862cb820b89718c8b2dcc3bba4fe2.tar.bz2 rpm-8dfb93f84f7862cb820b89718c8b2dcc3bba4fe2.zip | |
non-linux, non-gcc portability fixes (Tim Mooney).
CVS patchset: 2973
CVS date: 1999/04/08 20:53:45
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/macro.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rpmio/macro.c b/rpmio/macro.c index 69bb641c4..a6e7f310b 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -5,7 +5,7 @@ #define isblank(_c) ((_c) == ' ' || (_c) == '\t') #define STREQ(_t, _f, _fn) ((_fn) == (sizeof(_t)-1) && !strncmp((_t), (_f), (_fn))) -#define FREE(_x) { if (_x) free(_x); ((void *)(_x)) = NULL; } +#define FREE(_x) { if (_x) free((void *)_x); (_x) = NULL; } #ifdef DEBUG_MACROS #define rpmError fprintf @@ -530,9 +530,9 @@ popMacro(MacroEntry **mep) if (me) { /* XXX cast to workaround const */ if ((*mep = me->prev) == NULL) - FREE((char *)me->name); - FREE((char *)me->opts); - FREE((char *)me->body); + FREE(me->name); + FREE(me->opts); + FREE(me->body); FREE(me); } } @@ -1224,9 +1224,9 @@ freeMacros(MacroContext *mc) while ((me = mc->macroTable[i]) != NULL) { /* XXX cast to workaround const */ if ((mc->macroTable[i] = me->prev) == NULL) - FREE((char *)me->name); - FREE((char *)me->opts); - FREE((char *)me->body); + FREE(me->name); + FREE(me->opts); + FREE(me->body); FREE(me); } } |