diff options
| author | jbj <devnull@localhost> | 2000-12-12 20:03:45 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2000-12-12 20:03:45 +0000 |
| commit | db32ab6bea1b635129820d6b628e6156c61b5385 (patch) | |
| tree | 055f7ee7d5e06ba0b3e858b82f639310b892503d /build/parsePreamble.c | |
| parent | 2e9d2616969433851a1c883c900d6ea5acde67b7 (diff) | |
| download | librpm-tizen-db32ab6bea1b635129820d6b628e6156c61b5385.tar.gz librpm-tizen-db32ab6bea1b635129820d6b628e6156c61b5385.tar.bz2 librpm-tizen-db32ab6bea1b635129820d6b628e6156c61b5385.zip | |
Sync with rpm-4_0 branch.
CVS patchset: 4338
CVS date: 2000/12/12 20:03:45
Diffstat (limited to 'build/parsePreamble.c')
| -rw-r--r-- | build/parsePreamble.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build/parsePreamble.c b/build/parsePreamble.c index b96b0c222..3294d4135 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -7,6 +7,7 @@ #include <rpmio_internal.h> #include <rpmbuild.h> +#include "debug.h" static int_32 copyTagsDuringParse[] = { RPMTAG_EPOCH, @@ -282,7 +283,7 @@ static void fillOutMainPackage(Header h) const char *val = rpmExpand(ot->ot_mac, NULL); if (val && *val != '%') headerAddEntry(h, ot->ot_tag, RPM_STRING_TYPE, (void *)val, 1); - xfree(val); + free((void *)val); } } } @@ -336,7 +337,7 @@ static int readIcon(Header h, const char *file) rc = RPMERR_BADSPEC; goto exit; } - xfree(icon); + free((void *)icon); exit: FREE(fn); @@ -476,7 +477,7 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro, } else { const char * specURL = field; - xfree(buildRootURL); + free((void *)buildRootURL); (void) urlPath(specURL, (const char **)&field); if (*field == '\0') field = "/"; buildRootURL = rpmGenPath(spec->rootURL, field, NULL); @@ -493,10 +494,10 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro, if (!strcmp(buildRoot, "/")) { rpmError(RPMERR_BADSPEC, _("BuildRoot can not be \"/\": %s"), spec->buildRootURL); - xfree(buildRootURL); + free((void *)buildRootURL); return RPMERR_BADSPEC; } - xfree(buildRootURL); + free((void *)buildRootURL); } break; case RPMTAG_PREFIXES: addOrAppendListEntry(pkg->header, tag, field); |