RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 08-Dec-2007 22:30:22
Branch: HEAD Handle: 2007120821301903
Modified files:
rpm CHANGES
rpm/build files.c pack.c parseBuildInstallClean.c
parseChangelog.c parseDescription.c parseFiles.c
parsePreamble.c parsePrep.c parseReqs.c
parseScript.c rpmbuild.h rpmspec.h spec.c
rpm/lib rpmfc.c rpmfc.h
Log:
- rpm.org: use RPMRC_OK, not 0, returns in many functions.
Summary:
Revision Changes Path
1.1965 +1 -0 rpm/CHANGES
1.305 +76 -80 rpm/build/files.c
2.273 +8 -8 rpm/build/pack.c
2.26 +3 -2 rpm/build/parseBuildInstallClean.c
2.38 +8 -7 rpm/build/parseChangelog.c
2.33 +1 -1 rpm/build/parseDescription.c
2.30 +1 -1 rpm/build/parseFiles.c
2.156 +18 -17 rpm/build/parsePreamble.c
2.99 +6 -6 rpm/build/parsePrep.c
2.50 +2 -2 rpm/build/parseReqs.c
2.56 +3 -2 rpm/build/parseScript.c
2.86 +12 -12 rpm/build/rpmbuild.h
2.66 +1 -1 rpm/build/rpmspec.h
2.168 +3 -3 rpm/build/spec.c
1.45 +11 -11 rpm/lib/rpmfc.c
1.7 +7 -7 rpm/lib/rpmfc.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1964 -r1.1965 CHANGES
--- rpm/CHANGES 8 Dec 2007 19:36:28 -0000 1.1964
+++ rpm/CHANGES 8 Dec 2007 21:30:19 -0000 1.1965
@@ -1,4 +1,5 @@
5.0a4 -> 5.0b1:
+ - rpm.org: use RPMRC_OK, not 0, returns in many functions.
- rpm.org: @return, not @returns, in doxygen markup.
- rpm.org: Don't do tilde expansion if HOME not set.
- rpm.org: Add RPMCALLBACK_SCRIPT_ERROR callback type (not the best fix).
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.304 -r1.305 files.c
--- rpm/build/files.c 6 Dec 2007 18:23:26 -0000 1.304
+++ rpm/build/files.c 8 Dec 2007 21:30:20 -0000 1.305
@@ -322,10 +322,10 @@
* Parse %verify and %defverify from file manifest.
* @param buf current spec file line
* @param fl package file tree walk data
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int parseForVerify(char * buf, FileList fl)
+static rpmRC parseForVerify(char * buf, FileList fl)
/*@modifies buf, fl->processingFailed,
fl->currentVerifyFlags, fl->defVerifyFlags,
fl->currentSpecdFlags, fl->defSpecdFlags @*/
@@ -344,7 +344,7 @@
resultVerify = &(fl->defVerifyFlags);
specdFlags = &fl->defSpecdFlags;
} else
- return 0;
+ return RPMRC_OK;
for (pe = p; (pe-p) < strlen(name); pe++)
*pe = ' ';
@@ -410,7 +410,7 @@
*resultVerify = negated ? ~(verifyFlags) : verifyFlags;
*specdFlags |= SPECD_VERIFY;
- return 0;
+ return RPMRC_OK;
}
/*@=boundswrite@*/
@@ -420,20 +420,20 @@
* Parse %dev from file manifest.
* @param buf current spec file line
* @param fl package file tree walk data
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int parseForDev(char * buf, FileList fl)
+static rpmRC parseForDev(char * buf, FileList fl)
/*@modifies buf, fl->processingFailed,
fl->noGlob, fl->devtype, fl->devmajor, fl->devminor @*/
{
const char * name;
const char * errstr = NULL;
char *p, *pe, *q;
- int rc = RPMRC_FAIL; /* assume error */
+ rpmRC rc = RPMRC_FAIL; /* assume error */
if ((p = strstr(buf, (name = "%dev"))) == NULL)
- return 0;
+ return RPMRC_OK;
for (pe = p; (pe-p) < strlen(name); pe++)
*pe = ' ';
@@ -522,10 +522,10 @@
* Parse %attr and %defattr from file manifest.
* @param buf current spec file line
* @param fl package file tree walk data
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int parseForAttr(char * buf, FileList fl)
+static rpmRC parseForAttr(char * buf, FileList fl)
/*@modifies buf, fl->processingFailed,
fl->cur_ar, fl->def_ar,
fl->currentSpecdFlags, fl->defSpecdFlags @*/
@@ -544,7 +544,7 @@
ret_ar = &(fl->def_ar);
specdFlags = &fl->defSpecdFlags;
} else
- return 0;
+ return RPMRC_OK;
for (pe = p; (pe-p) < strlen(name); pe++)
*pe = ' ';
@@ -618,7 +618,7 @@
if ((x == 0) || (ar->ar_fmode & ~MYALLPERMS)) {
rpmlog(RPMLOG_ERR, _("Bad mode spec: %s(%s)\n"), name, q);
fl->processingFailed = 1;
- return RPMLOG_ERR;
+ return RPMRC_FAIL;
}
ar->ar_fmode = ui;
} else
@@ -647,7 +647,7 @@
/* XXX fix all this */
*specdFlags |= SPECD_UID | SPECD_GID | SPECD_FILEMODE | SPECD_DIRMODE;
- return 0;
+ return RPMRC_OK;
}
/*@=boundswrite@*/
@@ -655,17 +655,17 @@
* Parse %config from file manifest.
* @param buf current spec file line
* @param fl package file tree walk data
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int parseForConfig(char * buf, FileList fl)
+static rpmRC parseForConfig(char * buf, FileList fl)
/*@modifies buf, fl->processingFailed, fl->currentFlags @*/
{
char *p, *pe, *q;
const char *name;
if ((p = strstr(buf, (name = "%config"))) == NULL)
- return 0;
+ return RPMRC_OK;
fl->currentFlags |= RPMFILE_CONFIG;
@@ -674,7 +674,7 @@
*pe = ' ';
SKIPSPACE(pe);
if (*pe != '(')
- return 0;
+ return RPMRC_OK;
/* Bracket %config args */
*pe++ = ' ';
@@ -713,7 +713,7 @@
}
}
- return 0;
+ return RPMRC_OK;
}
/*@=boundswrite@*/
@@ -731,10 +731,10 @@
* Parse %lang from file manifest.
* @param buf current spec file line
* @param fl package file tree walk data
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-bounds@*/
-static int parseForLang(char * buf, FileList fl)
+static rpmRC parseForLang(char * buf, FileList fl)
/*@modifies buf, fl->processingFailed,
fl->currentLangs, fl->nLangs @*/
{
@@ -789,7 +789,7 @@
_("Unusual locale length: \"%.*s\" in %%lang(%s)\n"),
(int)np, p, q);
fl->processingFailed = 1;
- return RPMLOG_ERR;
+ return RPMRC_FAIL;
}
/* Check for duplicate locales */
@@ -818,7 +818,7 @@
if (fl->currentLangs)
qsort(fl->currentLangs, fl->nLangs, sizeof(*fl->currentLangs), langCmp);
- return 0;
+ return RPMRC_OK;
}
/*@=bounds@*/
@@ -902,10 +902,10 @@
* @param buf current spec file line
* @param fl package file tree walk data
* @retval *fileName file name
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf,
+static rpmRC parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf,
FileList fl, /*@out@*/ const char ** fileName)
/*@globals rpmGlobalMacroContext, h_errno @*/
/*@modifies buf, fl->processingFailed, *fileName,
@@ -915,12 +915,12 @@
pkg->specialDoc, rpmGlobalMacroContext @*/
{
char *s, *t;
- int res, specialDoc = 0;
+ int specialDoc = 0;
char specialDocBuf[BUFSIZ];
+ rpmRC res = RPMRC_OK; /* assume success */
specialDocBuf[0] = '\0';
*fileName = NULL;
- res = 0;
t = buf;
while ((s = strtokWithQuotes(t, " \t\n")) != NULL) {
@@ -930,7 +930,7 @@
if (fl->docDirCount == MAXDOCDIR) {
rpmlog(RPMLOG_CRIT, _("Hit limit for %%docdir\n"));
fl->processingFailed = 1;
- res = 1;
+ res = RPMRC_FAIL;
}
if (s != NULL)
@@ -938,7 +938,7 @@
if (s == NULL || strtokWithQuotes(NULL, " \t\n")) {
rpmlog(RPMLOG_CRIT, _("Only one arg for %%docdir\n"));
fl->processingFailed = 1;
- res = 1;
+ res = RPMRC_FAIL;
}
break;
}
@@ -973,7 +973,7 @@
rpmlog(RPMLOG_ERR, _("Two files on one line: %s\n"),
*fileName);
fl->processingFailed = 1;
- res = 1;
+ res = RPMRC_FAIL;
}
/*@-branchstate@*/
@@ -994,7 +994,7 @@
rpmlog(RPMLOG_ERR,
_("File must begin with \"/\": %s\n"), s);
fl->processingFailed = 1;
- res = 1;
+ res = RPMRC_FAIL;
/*@switchbreak@*/ break;
case URL_IS_PATH:
*fileName = s;
@@ -1013,7 +1013,7 @@
_("Can't mix special %%doc with other forms: %s\n"),
(*fileName ? *fileName : ""));
fl->processingFailed = 1;
- res = 1;
+ res = RPMRC_FAIL;
} else {
/* XXX WATCHOUT: buf is an arg */
{ static char *_docdir_fmt= 0;
@@ -1031,7 +1031,7 @@
if (!fmt) {
rpmlog(RPMLOG_ERR, _("illegal _docdir_fmt: %s\n"), errstr);
fl->processingFailed = 1;
- res = 1;
+ res = RPMRC_FAIL;
}
ddir = rpmGetPath("%{_docdir}/", fmt, NULL);
strcpy(buf, ddir);
@@ -1748,7 +1748,7 @@
/*@=boundswrite@*/
/* forward ref */
-static int recurseDir(FileList fl, const char * diskURL)
+static rpmRC recurseDir(FileList fl, const char * diskURL)
/*@globals check_fileList, rpmGlobalMacroContext, h_errno,
fileSystem, internalState @*/
/*@modifies *fl, fl->processingFailed,
@@ -1762,7 +1762,7 @@
* @param fl package file tree walk data
* @param diskURL path to file
* @param statp file stat (possibly NULL)
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
static int addFile(FileList fl, const char * diskURL,
@@ -1784,7 +1784,7 @@
const char *fileUname;
const char *fileGname;
char *lang;
- int rc = 0;
+ rpmRC rc = RPMRC_OK;
/* Path may have prepended buildRootURL, so locate the original filename. */
/*
@@ -1863,7 +1863,7 @@
} else if (Lstat(diskURL, statp)) {
if (fl->currentFlags & RPMFILE_OPTIONAL) {
rpmlog(RPMLOG_WARNING, _("Optional file not found: %s\n"), diskURL);
- rc = 0;
+ rc = RPMRC_OK;
} else {
rpmlog(RPMLOG_ERR, _("File not found: %s\n"), diskURL);
fl->processingFailed = 1;
@@ -1996,15 +1996,15 @@
* Add directory (and all of its files) to the package manifest.
* @param fl package file tree walk data
* @param diskURL path to file
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-static int recurseDir(FileList fl, const char * diskURL)
+static rpmRC recurseDir(FileList fl, const char * diskURL)
{
char * ftsSet[2];
FTS * ftsp;
FTSENT * fts;
int myFtsOpts = (FTS_COMFOLLOW | FTS_NOCHDIR | FTS_PHYSICAL);
- int rc = RPMRC_FAIL;
+ rpmRC rc = RPMRC_FAIL;
fl->inFtw = 1; /* Flag to indicate file has buildRootURL prefixed */
fl->isDir = 1; /* Keep it from following myftw() again */
@@ -2036,7 +2036,7 @@
rc = RPMRC_FAIL;
/*@switchbreak@*/ break;
}
- if (rc)
+ if (rc != RPMRC_OK)
break;
}
(void) Fts_close(ftsp);
@@ -2053,9 +2053,9 @@
* @param fl package file tree walk data
* @param fileURL path to file, relative is builddir, absolute buildroot.
* @param tag tag to add
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-static int processMetadataFile(Package pkg, FileList fl, const char * fileURL,
+static rpmRC processMetadataFile(Package pkg, FileList fl, const char * fileURL,
rpmTag tag)
/*@globals check_fileList, rpmGlobalMacroContext, h_errno,
fileSystem, internalState @*/
@@ -2072,7 +2072,7 @@
uint8_t * pkt = NULL;
ssize_t pktlen = 0;
int absolute = 0;
- int rc = 1;
+ rpmRC rc = RPMRC_FAIL;
int xx;
(void) urlPath(fileURL, &fn);
@@ -2090,18 +2090,18 @@
goto exit;
/*@notreached@*/ break;
case RPMTAG_PUBKEYS:
- if ((rc = pgpReadPkts(fn, (const uint8_t **)&pkt, (size_t *)&pktlen)) <= 0) {
+ if ((xx = pgpReadPkts(fn, (const uint8_t **)&pkt, (size_t *)&pktlen)) <= 0) {
rpmlog(RPMLOG_ERR, _("%s: public key read failed.\n"), fn);
goto exit;
}
- if (rc != PGPARMOR_PUBKEY) {
+ if (xx != PGPARMOR_PUBKEY) {
rpmlog(RPMLOG_ERR, _("%s: not an armored public key.\n"), fn);
goto exit;
}
apkt = pgpArmorWrap(PGPARMOR_PUBKEY, pkt, pktlen);
break;
case RPMTAG_POLICIES:
- if ((rc = rpmioSlurp(fn, &pkt, &pktlen)) != 0) {
+ if ((xx = rpmioSlurp(fn, &pkt, &pktlen)) != 0) {
rpmlog(RPMLOG_ERR, _("%s: *.te policy read failed.\n"), fn);
goto exit;
}
@@ -2119,7 +2119,7 @@
xx = headerPut(pkg->header, he, 0);
he->append = 0;
- rc = 0;
+ rc = RPMRC_OK;
if (absolute)
rc = addFile(fl, fn, NULL);
@@ -2127,10 +2127,8 @@
apkt = _free(apkt);
pkt = _free(pkt);
fn = _free(fn);
- if (rc) {
+ if (rc != RPMRC_OK)
fl->processingFailed = 1;
- rc = RPMRC_FAIL;
- }
return rc;
}
@@ -2139,9 +2137,9 @@
* @param pkg package control structure
* @param fl package file tree walk data
* @param fileURL
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-static int processBinaryFile(/*@unused@*/ Package pkg, FileList fl,
+static rpmRC processBinaryFile(/*@unused@*/ Package pkg, FileList fl,
const char * fileURL)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies *fl, fl->processingFailed,
@@ -2152,7 +2150,8 @@
int quote = 1; /* XXX permit quoted glob characters. */
int doGlob;
const char *diskURL = NULL;
- int rc = 0;
+ rpmRC rc = RPMRC_OK;
+ int xx;
doGlob = Glob_pattern_p(fileURL, quote);
@@ -2162,7 +2161,7 @@
if (*fileName != '/') {
rpmlog(RPMLOG_ERR, _("File needs leading \"/\": %s\n"),
fileName);
- rc = 1;
+ rc = RPMRC_FAIL;
goto exit;
}
}
@@ -2186,13 +2185,13 @@
if (fl->noGlob) {
rpmlog(RPMLOG_ERR, _("Glob not permitted: %s\n"),
diskURL);
- rc = 1;
+ rc = RPMRC_FAIL;
goto exit;
}
/*@-branchstate@*/
- rc = rpmGlob(diskURL, &argc, &argv);
- if (rc == 0 && argc >= 1) {
+ xx = rpmGlob(diskURL, &argc, &argv);
+ if (xx == 0 && argc >= 1) {
for (i = 0; i < argc; i++) {
rc = addFile(fl, argv[i], NULL);
/*@-boundswrite@*/
@@ -2204,32 +2203,29 @@
if (fl->currentFlags & RPMFILE_OPTIONAL) {
rpmlog(RPMLOG_WARNING, _("Optional file not found by glob: %s\n"),
diskURL);
- rc = 0;
+ rc = RPMRC_OK;
} else {
rpmlog(RPMLOG_ERR, _("File not found by glob: %s\n"),
diskURL);
- rc = 1;
+ rc = RPMRC_FAIL;
}
goto exit;
}
/*@=branchstate@*/
- } else {
+ } else
rc = addFile(fl, diskURL, NULL);
- }
exit:
diskURL = _free(diskURL);
- if (rc) {
+ if (rc != RPMRC_OK)
fl->processingFailed = 1;
- rc = RPMRC_FAIL;
- }
return rc;
}
/**
*/
/*@-boundswrite@*/
-static int processPackageFiles(Spec spec, Package pkg,
+static rpmRC processPackageFiles(Spec spec, Package pkg,
int installSpecialDoc, int test)
/*@globals rpmGlobalMacroContext, h_errno,
fileSystem, internalState@*/
@@ -2396,18 +2392,18 @@
dupAttrRec(&fl.def_ar, &fl.cur_ar);
/*@-nullpass@*/ /* LCL: buf is NULL ?!? */
- if (parseForVerify(buf, &fl))
+ if (parseForVerify(buf, &fl) != RPMRC_OK)
continue;
- if (parseForAttr(buf, &fl))
+ if (parseForAttr(buf, &fl) != RPMRC_OK)
continue;
- if (parseForDev(buf, &fl))
+ if (parseForDev(buf, &fl) != RPMRC_OK)
continue;
- if (parseForConfig(buf, &fl))
+ if (parseForConfig(buf, &fl) != RPMRC_OK)
continue;
- if (parseForLang(buf, &fl))
+ if (parseForLang(buf, &fl) != RPMRC_OK)
continue;
/*@-nullstate@*/ /* FIX: pkg->fileFile might be NULL */
- if (parseForSimple(spec, pkg, buf, &fl, &fileName))
+ if (parseForSimple(spec, pkg, buf, &fl, &fileName) != RPMRC_OK)
/*@=nullstate@*/
continue;
/*@=nullpass@*/
@@ -2514,7 +2510,7 @@
fl.fileList = freeFileList(fl.fileList, fl.fileListRecsUsed);
while (fl.docDirCount--)
fl.docDirs[fl.docDirCount] = _free(fl.docDirs[fl.docDirCount]);
- return fl.processingFailed;
+ return (fl.processingFailed ? RPMRC_FAIL : RPMRC_OK);
}
/*@=boundswrite@*/
@@ -2821,13 +2817,13 @@
}
/*@-incondefs@*/
-int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
+rpmRC processBinaryFiles(Spec spec, int installSpecialDoc, int test)
/*@globals check_fileList @*/
/*@modifies check_fileList @*/
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Package pkg;
- int res = 0;
+ rpmRC res = RPMRC_OK;
int xx;
check_fileList = newStringBuf();
@@ -2845,15 +2841,15 @@
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), he->p.str);
he->p.ptr = _free(he->p.ptr);
- if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)))
- res = rc;
+ if ((xx = processPackageFiles(spec, pkg, installSpecialDoc, test)))
+ res = RPMRC_FAIL;
/* Finalize package scriptlets before extracting dependencies. */
if ((rc = processScriptFiles(spec, pkg)))
res = rc;
- if ((rc = rpmfcGenerateDepends(spec, pkg)))
- res = rc;
+ if ((xx = rpmfcGenerateDepends(spec, pkg)))
+ res = RPMRC_FAIL;
/* XXX this should be earlier for deps to be entirely sorted. */
providePackageNVR(pkg->header);
@@ -2867,8 +2863,8 @@
*/
if (checkFiles(check_fileList) > 0) {
- if (res == 0)
- res = 1;
+ if (res == RPMRC_OK)
+ res = RPMRC_FAIL;
}
check_fileList = freeStringBuf(check_fileList);
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.272 -r2.273 pack.c
--- rpm/build/pack.c 8 Dec 2007 05:15:11 -0000 2.272
+++ rpm/build/pack.c 8 Dec 2007 21:30:20 -0000 2.273
@@ -227,7 +227,7 @@
return 0;
}
-int processScriptFiles(Spec spec, Package pkg)
+rpmRC processScriptFiles(Spec spec, Package pkg)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies pkg->header, rpmGlobalMacroContext,
fileSystem, internalState @*/
@@ -330,7 +330,7 @@
}
}
- return 0;
+ return RPMRC_OK;
}
#if defined(DEAD)
@@ -1003,14 +1003,14 @@
};
/*@-boundswrite@*/
-int packageBinaries(Spec spec)
+rpmRC packageBinaries(Spec spec)
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct cpioSourceArchive_s csabuf;
CSA_t csa = &csabuf;
- int rc;
const char *errorString;
Package pkg;
+ rpmRC rc;
int xx;
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
@@ -1111,17 +1111,17 @@
return rc;
}
- return 0;
+ return RPMRC_OK;
}
/*@=boundswrite@*/
/*@-boundswrite@*/
-int packageSources(Spec spec)
+rpmRC packageSources(Spec spec)
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct cpioSourceArchive_s csabuf;
CSA_t csa = &csabuf;
- int rc;
+ rpmRC rc;
int xx;
/* Add rpmlib markers for tracking. */
@@ -1186,6 +1186,6 @@
fn = _free(fn);
}
- return rc;
+ return (rc ? RPMRC_FAIL : RPMRC_OK);
}
/*@=boundswrite@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseBuildInstallClean.c
============================================================================
$ cvs diff -u -r2.25 -r2.26 parseBuildInstallClean.c
--- rpm/build/parseBuildInstallClean.c 8 Dec 2007 06:31:08 -0000 2.25
+++ rpm/build/parseBuildInstallClean.c 8 Dec 2007 21:30:20 -0000 2.26
@@ -13,9 +13,10 @@
/*@-boundswrite@*/
int parseBuildInstallClean(Spec spec, rpmParseState parsePart)
{
- int nextPart, rc;
+ int nextPart;
StringBuf *sbp = NULL;
const char *name = NULL;
+ rpmRC rc;
/*@-branchstate@*/
if (parsePart == PART_BUILD) {
@@ -64,7 +65,7 @@
/* There are no options to %build, %install, %check, or %clean */
if ((rc = readLine(spec, STRIP_NOTHING)) > 0)
return PART_NONE;
- if (rc)
+ if (rc != RPMRC_OK)
return rc;
while (! (nextPart = isPart(spec->line))) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseChangelog.c
============================================================================
$ cvs diff -u -r2.37 -r2.38 parseChangelog.c
--- rpm/build/parseChangelog.c 24 Nov 2007 23:15:31 -0000 2.37
+++ rpm/build/parseChangelog.c 8 Dec 2007 21:30:20 -0000 2.38
@@ -128,10 +128,10 @@
* Add %changelog section to header.
* @param h header
* @param sb changelog strings
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int addChangelog(Header h, StringBuf sb)
+static rpmRC addChangelog(Header h, StringBuf sb)
/*@globals rpmGlobalMacroContext, h_errno @*/
/*@modifies h, rpmGlobalMacroContext @*/
{
@@ -262,15 +262,16 @@
int parseChangelog(Spec spec)
{
- int nextPart, res, rc;
+ int nextPart;
StringBuf sb = newStringBuf();
+ rpmRC rc;
/* There are no options to %changelog */
if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
sb = freeStringBuf(sb);
return PART_NONE;
}
- if (rc)
+ if (rc != RPMRC_OK)
return rc;
while (! (nextPart = isPart(spec->line))) {
@@ -283,12 +284,12 @@
nextPart = PART_NONE;
break;
}
- if (rc)
+ if (rc != RPMRC_OK)
return rc;
}
- res = addChangelog(spec->packages->header, sb);
+ rc = addChangelog(spec->packages->header, sb);
sb = freeStringBuf(sb);
- return (res) ? res : nextPart;
+ return (rc != RPMRC_OK ? rc : nextPart);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseDescription.c
============================================================================
$ cvs diff -u -r2.32 -r2.33 parseDescription.c
--- rpm/build/parseDescription.c 26 Nov 2007 05:16:49 -0000 2.32
+++ rpm/build/parseDescription.c 8 Dec 2007 21:30:20 -0000 2.33
@@ -76,7 +76,7 @@
}
}
- if (lookupPackage(spec, name, flag, &pkg)) {
+ if (lookupPackage(spec, name, flag, &pkg) != RPMRC_OK) {
rpmlog(RPMLOG_ERR, _("line %d: Package does not exist: %s\n"),
spec->lineNum, spec->line);
goto exit;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseFiles.c
============================================================================
$ cvs diff -u -r2.29 -r2.30 parseFiles.c
--- rpm/build/parseFiles.c 11 Oct 2007 13:04:26 -0000 2.29
+++ rpm/build/parseFiles.c 8 Dec 2007 21:30:20 -0000 2.30
@@ -76,7 +76,7 @@
}
}
- if (lookupPackage(spec, name, flag, &pkg)) {
+ if (lookupPackage(spec, name, flag, &pkg) != RPMRC_OK) {
rpmlog(RPMLOG_ERR, _("line %d: Package does not exist: %s\n"),
spec->lineNum, spec->line);
rc = RPMRC_FAIL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.155 -r2.156 parsePreamble.c
--- rpm/build/parsePreamble.c 6 Dec 2007 18:23:26 -0000 2.155
+++ rpm/build/parsePreamble.c 8 Dec 2007 21:30:20 -0000 2.156
@@ -276,13 +276,13 @@
* Check that required tags are present in header.
* @param h header
* @param NVR package name-version-release
- * @return 0 if OK
+ * @return RPMRC_OK if OK
*/
-static int checkForRequired(Header h, const char * NVR)
- /*@modifies h @*/ /* LCL: parse error here with modifies */
+static rpmRC checkForRequired(Header h, const char * NVR)
+ /*@modifies h @*/
{
- int res = 0;
rpmTag * p;
+ rpmRC rc = RPMRC_OK;
/*@-boundsread@*/
for (p = requiredTags; *p != 0; p++) {
@@ -290,27 +290,27 @@
rpmlog(RPMLOG_ERR,
_("%s field must be present in package: %s\n"),
tagName(*p), NVR);
- res = 1;
+ rc = RPMRC_FAIL;
}
}
/*@=boundsread@*/
- return res;
+ return rc;
}
/**
* Check that no duplicate tags are present in header.
* @param h header
* @param NVR package name-version-release
- * @return 0 if OK
+ * @return RPMRC_OK if OK
*/
-static int checkForDuplicates(Header h, const char * NVR)
+static rpmRC checkForDuplicates(Header h, const char * NVR)
/*@modifies h @*/
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
HeaderIterator hi;
rpmTag lastTag = 0;
- int res = 0;
+ rpmRC rc = RPMRC_OK;
for (hi = headerInit(h);
headerNext(hi, he, 0);
@@ -322,11 +322,11 @@
}
rpmlog(RPMLOG_ERR, _("Duplicate %s entries in package: %s\n"),
tagName(he->tag), NVR);
- res = 1;
+ rc = RPMRC_FAIL;
}
hi = headerFini(hi);
- return res;
+ return rc;
}
/**
@@ -528,7 +528,7 @@
/**
*/
/*@-boundswrite@*/
-static int handlePreambleTag(Spec spec, Package pkg, rpmTag tag,
+static rpmRC handlePreambleTag(Spec spec, Package pkg, rpmTag tag,
const char *macro, const char *lang)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies spec->macros, spec->st,
@@ -816,7 +816,7 @@
if (macro)
addMacro(spec->macros, macro, NULL, field, RMIL_SPEC);
- return 0;
+ return RPMRC_OK;
}
/*@=boundswrite@*/
@@ -990,11 +990,12 @@
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmParseState nextPart;
- int rc, xx;
+ int xx;
char *name, *linep;
Package pkg;
char NVR[BUFSIZ];
char lang[BUFSIZ];
+ rpmRC rc;
strcpy(NVR, "(main package)");
@@ -1010,7 +1011,7 @@
return RPMRC_FAIL;
}
- if (!lookupPackage(spec, name, flag, NULL)) {
+ if (lookupPackage(spec, name, flag, NULL) == RPMRC_OK) {
rpmlog(RPMLOG_ERR, _("Package already exists: %s\n"),
spec->line);
return RPMRC_FAIL;
@@ -1073,14 +1074,14 @@
if (pkg == spec->packages)
fillOutMainPackage(pkg->header);
- if (checkForDuplicates(pkg->header, NVR))
+ if (checkForDuplicates(pkg->header, NVR) != RPMRC_OK)
return RPMRC_FAIL;
if (pkg != spec->packages)
headerCopyTags(spec->packages->header, pkg->header,
(uint32_t *)copyTagsDuringParse);
- if (checkForRequired(pkg->header, NVR))
+ if (checkForRequired(pkg->header, NVR) != RPMRC_OK)
return RPMRC_FAIL;
return nextPart;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.98 -r2.99 parsePrep.c
--- rpm/build/parsePrep.c 6 Dec 2007 14:47:48 -0000 2.98
+++ rpm/build/parsePrep.c 8 Dec 2007 21:30:20 -0000 2.99
@@ -33,9 +33,9 @@
/**
* Check that file owner and group are known.
* @param urlfn file url
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-static int checkOwners(const char * urlfn)
+static rpmRC checkOwners(const char * urlfn)
/*@globals h_errno, fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/
{
@@ -51,7 +51,7 @@
return RPMRC_FAIL;
}
- return 0;
+ return RPMRC_OK;
}
#ifndef DYING
@@ -484,10 +484,10 @@
* Parse %patch line.
* @param spec build info
* @param line current line from spec file
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-boundswrite@*/
-static int doPatchMacro(Spec spec, char *line)
+static rpmRC doPatchMacro(Spec spec, char *line)
/*@globals rpmGlobalMacroContext, h_errno,
fileSystem, internalState @*/
/*@modifies spec->prep, rpmGlobalMacroContext,
@@ -617,7 +617,7 @@
appendLineStringBuf(spec->prep, s);
}
- return 0;
+ return RPMRC_OK;
}
/*@=boundswrite@*/
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseReqs.c
============================================================================
$ cvs diff -u -r2.49 -r2.50 parseReqs.c
--- rpm/build/parseReqs.c 4 Nov 2007 19:37:02 -0000 2.49
+++ rpm/build/parseReqs.c 8 Dec 2007 21:30:20 -0000 2.50
@@ -13,7 +13,7 @@
#define SKIPWHITE(_x) {while(*(_x) && (xisspace(*_x) || *(_x) == ',')) (_x)++;}
#define SKIPNONWHITE(_x){while(*(_x) &&!(xisspace(*_x) || *(_x) == ',')) (_x)++;}
-int parseRCPOT(Spec spec, Package pkg, const char *field, rpmTag tagN,
+rpmRC parseRCPOT(Spec spec, Package pkg, const char *field, rpmTag tagN,
uint32_t index, rpmsenseFlags tagflags)
{
const char *r, *re, *v, *ve;
@@ -161,5 +161,5 @@
}
/*@=boundsread@*/
- return 0;
+ return RPMRC_OK;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseScript.c
============================================================================
$ cvs diff -u -r2.55 -r2.56 parseScript.c
--- rpm/build/parseScript.c 6 Dec 2007 20:19:09 -0000 2.55
+++ rpm/build/parseScript.c 8 Dec 2007 21:30:20 -0000 2.56
@@ -97,10 +97,11 @@
int nextPart;
char reqargs[BUFSIZ];
- int rc, argc;
+ int argc;
int arg;
const char **argv = NULL;
poptContext optCon = NULL;
+ rpmRC rc;
reqargs[0] = '\0';
/*@-mods@*/
@@ -261,7 +262,7 @@
}
}
- if (lookupPackage(spec, name, flag, &pkg)) {
+ if (lookupPackage(spec, name, flag, &pkg) != RPMRC_OK) {
rpmlog(RPMLOG_ERR, _("line %d: Package does not exist: %s\n"),
spec->lineNum, spec->line);
rc = RPMRC_FAIL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmbuild.h
============================================================================
$ cvs diff -u -r2.85 -r2.86 rpmbuild.h
--- rpm/build/rpmbuild.h 6 Dec 2007 20:19:09 -0000 2.85
+++ rpm/build/rpmbuild.h 8 Dec 2007 21:30:20 -0000 2.86
@@ -316,9 +316,9 @@
* @param tagN tag, identifies type of dependency
* @param index (0 always)
* @param tagflags dependency flags already known from context
- * @return 0 on success, RPMERR_BADSPEC on failure
+ * @return RPMRC_OK on success
*/
-int parseRCPOT(Spec spec, Package pkg, const char * field, rpmTag tagN,
+rpmRC parseRCPOT(Spec spec, Package pkg, const char * field, rpmTag tagN,
uint32_t index, rpmsenseFlags tagflags)
/*@globals rpmGlobalMacroContext, h_errno @*/
/*@modifies rpmGlobalMacroContext @*/;
@@ -380,9 +380,9 @@
* @param name (sub-)package name
* @param flag if PART_SUBNAME, then 1st package name is prepended
* @retval pkg package control structure
- * @return 0 on success, 1 on failure
+ * @return RPMRC_OK on success
*/
-int lookupPackage(Spec spec, /*@null@*/ const char * name, int flag,
+rpmRC lookupPackage(Spec spec, /*@null@*/ const char * name, int flag,
/*@out@*/ Package * pkg)
/*@modifies spec->packages, *pkg @*/;
@@ -435,9 +435,9 @@
* Append files (if any) to scriptlet tags.
* @param spec spec file control structure
* @param pkg package control structure
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-int processScriptFiles(Spec spec, Package pkg)
+rpmRC processScriptFiles(Spec spec, Package pkg)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies pkg->header, rpmGlobalMacroContext,
fileSystem, internalState @*/;
@@ -465,9 +465,9 @@
* @param spec spec file control structure
* @param installSpecialDoc
* @param test don't execute scripts or package if testing
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
+rpmRC processBinaryFiles(Spec spec, int installSpecialDoc, int test)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies spec->macros, *spec->packages,
spec->packages->cpioList, spec->packages->fileList,
@@ -540,9 +540,9 @@
/** \ingroup rpmbuild
* Generate binary package(s).
* @param spec spec file control structure
- * @return 0 on success
+ * @return rpmRC on success
*/
-int packageBinaries(Spec spec)
+rpmRC packageBinaries(Spec spec)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies spec->packages->header, spec->packages->cpioList,
spec->sourceRpmName,
@@ -551,9 +551,9 @@
/** \ingroup rpmbuild
* Generate source package.
* @param spec spec file control structure
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-int packageSources(Spec spec)
+rpmRC packageSources(Spec spec)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies spec->sourceHeader, spec->cookie, spec->sourceCpioList,
spec->sourceRpmName, spec->sourcePkgId,
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmspec.h
============================================================================
$ cvs diff -u -r2.65 -r2.66 rpmspec.h
--- rpm/build/rpmspec.h 6 Dec 2007 20:19:09 -0000 2.65
+++ rpm/build/rpmspec.h 8 Dec 2007 21:30:20 -0000 2.66
@@ -164,7 +164,7 @@
/*@dependent@*/ /*@null@*/
MacroContext macros;
- int (*_parseRCPOT) (Spec spec, Package pkg, const char *field, rpmTag tagN,
+ rpmRC (*_parseRCPOT) (Spec spec, Package pkg, const char *field, rpmTag tagN,
uint32_t index, rpmsenseFlags tagflags);
/*@only@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/spec.c
============================================================================
$ cvs diff -u -r2.167 -r2.168 spec.c
--- rpm/build/spec.c 6 Dec 2007 20:19:09 -0000 2.167
+++ rpm/build/spec.c 8 Dec 2007 21:30:20 -0000 2.168
@@ -65,7 +65,7 @@
}
/*@-boundswrite@*/
-int lookupPackage(Spec spec, const char *name, int flag, /*@out@*/Package *pkg)
+rpmRC lookupPackage(Spec spec, const char *name, int flag, /*@out@*/Package *pkg)
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char *fullName;
@@ -76,7 +76,7 @@
if (name == NULL) {
if (pkg)
*pkg = spec->packages;
- return 0;
+ return RPMRC_OK;
}
/* Construct package name */
@@ -110,7 +110,7 @@
if (pkg)
/*@-dependenttrans@*/ *pkg = p; /*@=dependenttrans@*/
- return ((p == NULL) ? 1 : 0);
+ return ((p == NULL) ? RPMRC_FAIL : RPMRC_OK);
}
/*@=boundswrite@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.44 -r1.45 rpmfc.c
--- rpm/lib/rpmfc.c 8 Dec 2007 05:15:11 -0000 1.44
+++ rpm/lib/rpmfc.c 8 Dec 2007 21:30:22 -0000 1.45
@@ -860,7 +860,7 @@
{ NULL, 0 }
};
-int rpmfcApply(rpmfc fc)
+rpmRC rpmfcApply(rpmfc fc)
{
rpmfcApplyTbl fcat;
const char * s;
@@ -964,10 +964,10 @@
fc->fddictn->vals[ix]++;
}
- return 0;
+ return RPMRC_OK;
}
-int rpmfcClassify(rpmfc fc, ARGV_t argv, uint16_t * fmode)
+rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, uint16_t * fmode)
{
ARGV_t fcav = NULL;
ARGV_t dav;
@@ -979,7 +979,7 @@
const char * magicfile = NULL;
if (fc == NULL || argv == NULL)
- return 0;
+ return RPMRC_OK;
magicfile = rpmExpand("%{?_rpmfc_magic_path}", NULL);
if (magicfile == NULL || *magicfile == '\0')
@@ -1105,7 +1105,7 @@
mg = rpmmgFree(mg);
magicfile = _free(magicfile);
- return 0;
+ return RPMRC_OK;
}
/**
@@ -1219,7 +1219,7 @@
/**
*/
-static int rpmfcGenerateDependsHelper(const Spec spec, Package pkg, rpmfi fi)
+static rpmRC rpmfcGenerateDependsHelper(const Spec spec, Package pkg, rpmfi fi)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies fi, rpmGlobalMacroContext, fileSystem, internalState @*/
{
@@ -1227,7 +1227,7 @@
StringBuf sb_stdout;
DepMsg_t dm;
int failnonzero = 0;
- int rc = 0;
+ rpmRC rc = RPMRC_OK;
/*
* Create file manifest buffer to deliver to dependency finder.
@@ -1391,7 +1391,7 @@
return rc;
}
-int rpmfcGenerateDepends(void * specp, void * pkgp)
+rpmRC rpmfcGenerateDepends(void * specp, void * pkgp)
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const Spec spec = specp;
@@ -1407,17 +1407,17 @@
const char * N;
const char * EVR;
int genConfigDeps, internaldeps;
- int rc = 0;
+ rpmRC rc = RPMRC_OK;
int i;
int xx;
/* Skip packages with no files. */
if (ac <= 0)
- return 0;
+ return RPMRC_OK;
/* Skip packages that have dependency generation disabled. */
if (! (pkg->autoReq || pkg->autoProv))
- return 0;
+ return RPMRC_OK;
/* If new-fangled dependency generation is disabled ... */
internaldeps = rpmExpandNumeric("%{?_use_internal_dependency_generator}");
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.h
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpmfc.h
--- rpm/lib/rpmfc.h 22 Nov 2007 18:50:25 -0000 1.6
+++ rpm/lib/rpmfc.h 8 Dec 2007 21:30:22 -0000 1.7
@@ -118,7 +118,7 @@
* @param av helper argv (with possible macros)
* @param sb_stdin helper input
* @retval *sb_stdoutp helper output
- * @param failnonzero IS non-zero helper exit status a failure?
+ * @param failnonzero Is non-zero helper exit status a failure?
*/
int rpmfcExec(ARGV_t av, StringBuf sb_stdin, /*@out@*/ StringBuf * sb_stdoutp,
int failnonzero)
@@ -175,10 +175,10 @@
* @param fc file classifier
* @param argv files to classify
* @param fmode files mode_t array (or NULL)
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-exportlocal@*/
-int rpmfcClassify(rpmfc fc, ARGV_t argv, /*@null@*/ uint16_t * fmode)
+rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, /*@null@*/ uint16_t * fmode)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @*/;
/*@=exportlocal@*/
@@ -186,10 +186,10 @@
/**
* Build file/package dependency dictionary and mappings.
* @param fc file classifier
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
/*@-exportlocal@*/
-int rpmfcApply(rpmfc fc)
+rpmRC rpmfcApply(rpmfc fc)
/*@modifies fc @*/;
/*@=exportlocal@*/
@@ -197,9 +197,9 @@
* Generate package dependencies.
* @param specp spec file control
* @param pkgp package control
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-int rpmfcGenerateDepends(void * specp, void * pkgp)
+rpmRC rpmfcGenerateDepends(void * specp, void * pkgp)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies *pkgp,
rpmGlobalMacroContext, fileSystem, internalState @*/;
@@ .
Received on Sat Dec 8 22:30:22 2007