diff options
Diffstat (limited to 'build/parsePrep.c')
| -rw-r--r-- | build/parsePrep.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/build/parsePrep.c b/build/parsePrep.c index da99e357b..f1aa47039 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -7,6 +7,7 @@ #include <rpmio_internal.h> #include <rpmbuild.h> +#include "debug.h" /* These have to be global to make up for stupid compilers */ static int leaveDirs, skipDefaultAction; @@ -93,7 +94,7 @@ static int checkOwners(const char *urlfn) /* XXX On non-build parse's, file cannot be stat'd or read */ if (!spec->force && (isCompressed(urlfn, &compressed) || checkOwners(urlfn))) { - xfree(urlfn); + free((void *)urlfn); return NULL; } @@ -105,7 +106,7 @@ static int checkOwners(const char *urlfn) case URL_IS_UNKNOWN: break; case URL_IS_DASH: - xfree(urlfn); + free((void *)urlfn); return NULL; /*@notreached@*/ break; } @@ -125,7 +126,7 @@ static int checkOwners(const char *urlfn) c, (const char *) basename(fn), zipper, fn, strip, args); - xfree(zipper); + free((void *)zipper); } else { sprintf(buf, "echo \"Patch #%d (%s):\"\n" @@ -133,7 +134,7 @@ static int checkOwners(const char *urlfn) strip, args, fn); } - xfree(urlfn); + free((void *)urlfn); return buf; } @@ -189,7 +190,7 @@ static int checkOwners(const char *urlfn) /* XXX On non-build parse's, file cannot be stat'd or read */ if (!spec->force && (isCompressed(urlfn, &compressed) || checkOwners(urlfn))) { - xfree(urlfn); + free((void *)urlfn); return NULL; } @@ -201,7 +202,7 @@ static int checkOwners(const char *urlfn) case URL_IS_UNKNOWN: break; case URL_IS_DASH: - xfree(urlfn); + free((void *)urlfn); return NULL; /*@notreached@*/ break; } @@ -226,7 +227,7 @@ static int checkOwners(const char *urlfn) zipper = rpmGetPath(t, NULL); buf[0] = '\0'; t = stpcpy(buf, zipper); - xfree(zipper); + free((void *)zipper); *t++ = ' '; t = stpcpy(t, fn); if (needtar) @@ -244,7 +245,7 @@ static int checkOwners(const char *urlfn) t = stpcpy(t, fn); } - xfree(urlfn); + free((void *)urlfn); return buf; } @@ -337,7 +338,7 @@ static int doSetupMacro(Spec spec, char *line) (void) urlPath(buildDirURL, &buildDir); sprintf(buf, "cd %s", buildDir); appendLineStringBuf(spec->prep, buf); - xfree(buildDirURL); + free((void *)buildDirURL); } /* delete any old sources */ @@ -390,7 +391,7 @@ static int doSetupMacro(Spec spec, char *line) const char *fix = rpmExpand(*fm, " .", NULL); if (fix && *fix != '%') appendLineStringBuf(spec->prep, fix); - xfree(fix); + free((void *)fix); } } |