Converging on lclint-3.0.17 strict level.

CVS patchset: 5118
CVS date: 2001/10/17 16:43:36

16 files changed, 99 insertions, 57 deletions

diff --git a/build/build.c b/build/build.c
index a92541043..18d13b7a7 100644
--- a/build/build.c
+++ b/build/build.c
@@ -22,7 +22,7 @@ static int _build_debug = 0;
 static void doRmSource(Spec spec)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies fileSystem @*/
+	/*@modifies rpmGlobalMacroContext, fileSystem @*/
 {
     struct Source *p;
     Package pkg;
@@ -211,7 +211,9 @@ fprintf(stderr, "*** addMacros\n");
     rpmMessage(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
     if (!(child = fork())) {
 
+	/*@-mods@*/
 	errno = 0;
+	/*@=mods@*/
 	(void) execvp(argv[0], (char *const *)argv);
 
 	rpmError(RPMERR_SCRIPT, _("Exec of %s failed (%s): %s\n"),
diff --git a/build/buildio.h b/build/buildio.h
index a84da6c7d..e36ee7eb9 100644
--- a/build/buildio.h
+++ b/build/buildio.h
@@ -41,7 +41,7 @@ extern "C" {
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies *specp, *lead, *sigs, csa, csa->cpioFdIn,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /**
  * Write rpm package to file.
@@ -66,7 +66,7 @@ int writeRPM(Header * hdrp,
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies *hdrp, *cookie, csa, csa->cpioArchiveSize,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 #ifdef __cplusplus
 }
diff --git a/build/expression.c b/build/expression.c
index 817e4dc20..8921c3294 100644
--- a/build/expression.c
+++ b/build/expression.c
@@ -183,7 +183,8 @@ static const char *prToken(int val)
  */
 static int rdToken(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken @*/
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/
 {
   int token;
   Value v = NULL;
@@ -319,14 +320,16 @@ static int rdToken(ParseState state)
 
 static Value doLogical(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken @*/;
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/;
 
 /**
  * @param state		expression parser state
  */
 static Value doPrimary(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken @*/
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/
 {
   Value v;
 
@@ -406,7 +409,8 @@ static Value doPrimary(ParseState state)
  */
 static Value doMultiplyDivide(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken @*/
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/
 {
   Value v1, v2 = NULL;
 
@@ -459,7 +463,8 @@ static Value doMultiplyDivide(ParseState state)
  */
 static Value doAddSubtract(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken @*/
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/
 {
   Value v1, v2 = NULL;
 
@@ -521,7 +526,8 @@ static Value doAddSubtract(ParseState state)
  */
 static Value doRelational(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken @*/
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/
 {
   Value v1, v2 = NULL;
 
@@ -616,7 +622,8 @@ static Value doRelational(ParseState state)
  */
 static Value doLogical(ParseState state)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies state->nextToken, rpmGlobalMacroContext @*/
+	/*@modifies state->nextToken, state->p, state->tokenValue,
+		rpmGlobalMacroContext @*/
 {
   Value v1, v2 = NULL;
 
diff --git a/build/files.c b/build/files.c
index 2e45354b5..adbadf6b0 100644
--- a/build/files.c
+++ b/build/files.c
@@ -782,7 +782,7 @@ static int parseForLang(char * buf, FileList fl)
  */
 static int parseForRegexLang(const char * fileName, /*@out@*/ char ** lang)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies *lang @*/
+	/*@modifies *lang, rpmGlobalMacroContext @*/
 {
     static int initialized = 0;
     static int hasRegex = 0;
@@ -889,7 +889,7 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf,
 		fl->currentFlags,
 		fl->docDirs, fl->docDirCount, fl->isDir,
 		fl->passedSpecialDoc, fl->isSpecialDoc,
-		pkg->specialDoc @*/
+		pkg->specialDoc, rpmGlobalMacroContext @*/
 {
     char *s, *t;
     int res, specialDoc = 0;
@@ -1113,7 +1113,7 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
 	/*@globals rpmGlobalMacroContext,
 		fileSystem @*/
 	/*@modifies h, *cpioList, fl->processingFailed, fl->fileList,
-		fileSystem @*/
+		rpmGlobalMacroContext, fileSystem @*/
 {
     int _addDotSlash = !(isSrc || rpmExpandNumeric("%{_noPayloadPrefix}"));
     uint_32 multiLibMask = 0;
@@ -1436,7 +1436,7 @@ static /*@null@*/ FileListRec freeFileList(/*@only@*/ FileListRec fileList,
 static int addFile(FileList fl, const char * diskURL, struct stat * statp)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies *statp, fl->processingFailed,
+	/*@modifies *statp, *fl, fl->processingFailed,
 		fl->fileList, fl->fileListRecsAlloced, fl->fileListRecsUsed,
 		fl->totalFileSize, fl->fileCount, fl->inFtw, fl->isDir,
 		rpmGlobalMacroContext, fileSystem @*/
@@ -1652,10 +1652,10 @@ static int processBinaryFile(/*@unused@*/ Package pkg, FileList fl,
 		const char * fileURL)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies fl->processingFailed,
+	/*@modifies *fl, fl->processingFailed,
 		fl->fileList, fl->fileListRecsAlloced, fl->fileListRecsUsed,
 		fl->totalFileSize, fl->fileCount, fl->inFtw, fl->isDir,
-		fileSystem @*/
+		rpmGlobalMacroContext, fileSystem @*/
 {
     int doGlob;
     const char *diskURL = NULL;
@@ -1729,7 +1729,7 @@ static int processPackageFiles(Spec spec, Package pkg,
 		fileSystem, internalState@*/
 	/*@modifies spec->macros,
 		pkg->cpioList, pkg->fileList, pkg->specialDoc, pkg->header,
-		fileSystem, internalState @*/
+		rpmGlobalMacroContext, fileSystem, internalState @*/
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     struct FileList_s fl;
@@ -2386,7 +2386,8 @@ DepMsg_t depMsgs[] = {
 static int generateDepends(Spec spec, Package pkg, TFI_t cpioList, int multiLib)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
-	/*@modifies cpioList, fileSystem, internalState @*/
+	/*@modifies cpioList, rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 {
     TFI_t fi = cpioList;
     StringBuf writeBuf;
diff --git a/build/myftw.c b/build/myftw.c
index 73004217a..65199ac4f 100644
--- a/build/myftw.c
+++ b/build/myftw.c
@@ -57,8 +57,8 @@ myftw_dir (DIR **dirs, int level, int descriptors,
 	   char *dir, size_t len, 
 	   myftwFunc func,
 	   void *fl)
-	/*@globals fileSystem@*/
-	/*@modifies fileSystem@*/
+	/*@globals errno, fileSystem @*/
+	/*@modifies *dirs, *dir, errno, fileSystem @*/
 {
   int got;
   struct dirent *entry;
@@ -237,7 +237,9 @@ int myftw (const char *dir,
 
 	  save = errno;
 	  (void) Closedir (dirs[0]);
+	  /*@-mods@*/
 	  errno = save;
+	  /*@=mods@*/
 	}
     }
 
diff --git a/build/names.c b/build/names.c
index bd4a14fae..d3a1c1d52 100644
--- a/build/names.c
+++ b/build/names.c
@@ -1,3 +1,4 @@
+/*@-mods@*/
 /** \ingroup rpmbuild
  * \file build/names.c
  * Simple user/group name/id cache (plus hostname and buildtime)
@@ -197,3 +198,4 @@ const char *const buildHost(void)
     }
     return(hostname);
 }
+/*@=mods@*/
diff --git a/build/pack.c b/build/pack.c
index fc238dd6c..e0b40c71f 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -50,7 +50,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
 		const char * fmodeMacro)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies fdo, csa, fileSystem @*/
+	/*@modifies fdo, csa, rpmGlobalMacroContext, fileSystem @*/
 {
     const char * rootDir = "/";
     rpmdb rpmdb = NULL;
@@ -125,7 +125,7 @@ static /*@only@*/ /*@null@*/ StringBuf addFileToTagAux(Spec spec,
 		const char * file, /*@only@*/ StringBuf sb)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies fileSystem @*/
+	/*@modifies rpmGlobalMacroContext, fileSystem @*/
 {
     char buf[BUFSIZ];
     const char * fn = buf;
@@ -163,7 +163,7 @@ static /*@only@*/ /*@null@*/ StringBuf addFileToTagAux(Spec spec,
 static int addFileToTag(Spec spec, const char * file, Header h, int tag)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies h, fileSystem @*/
+	/*@modifies h, rpmGlobalMacroContext, fileSystem @*/
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     StringBuf sb = newStringBuf();
@@ -188,7 +188,7 @@ static int addFileToTag(Spec spec, const char * file, Header h, int tag)
 static int addFileToArrayTag(Spec spec, const char *file, Header h, int tag)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies h, fileSystem @*/
+	/*@modifies h, rpmGlobalMacroContext, fileSystem @*/
 {
     StringBuf sb = newStringBuf();
     char *s;
@@ -208,7 +208,7 @@ static int addFileToArrayTag(Spec spec, const char *file, Header h, int tag)
 static int processScriptFiles(Spec spec, Package pkg)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies pkg->header, fileSystem @*/
+	/*@modifies pkg->header, rpmGlobalMacroContext, fileSystem @*/
 {
     struct TriggerFileEntry *p;
     
@@ -363,8 +363,8 @@ static unsigned char header_magic[8] = {
 static int rpmpkg_version = -1;
 
 static int rpmLeadVersion(void)
-	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies rpmGlobalMacroContext @*/
+	/*@globals rpmpkg_version, rpmGlobalMacroContext @*/
+	/*@modifies rpmpkg_version, rpmGlobalMacroContext @*/
 {
     int rpmlead_version;
 
diff --git a/build/parseDescription.c b/build/parseDescription.c
index b27312695..bd0b37301 100644
--- a/build/parseDescription.c
+++ b/build/parseDescription.c
@@ -38,8 +38,10 @@ int parseDescription(Spec spec)
     poptContext optCon = NULL;
     spectag t = NULL;
 
+    /*@-mods@*/
     name = NULL;
     lang = RPMBUILD_DEFAULT_LANG;
+    /*@=mods@*/
 
     if ((rc = poptParseArgvString(spec->line, &argc, &argv))) {
 	rpmError(RPMERR_BADSPEC, _("line %d: Error parsing %%description: %s\n"),
@@ -65,8 +67,10 @@ int parseDescription(Spec spec)
     }
 
     if (poptPeekArg(optCon)) {
+	/*@-mods@*/
 	if (name == NULL)
 	    name = poptGetArg(optCon);
+	/*@=mods@*/
 	if (poptPeekArg(optCon)) {
 	    rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s\n"),
 		     spec->lineNum,
diff --git a/build/parseFiles.c b/build/parseFiles.c
index f6ee8c90c..759fc0ca6 100644
--- a/build/parseFiles.c
+++ b/build/parseFiles.c
@@ -33,7 +33,10 @@ int parseFiles(Spec spec)
     int flag = PART_SUBNAME;
     poptContext optCon = NULL;
 
-    name = file = NULL;
+    /*@-mods@*/
+    name = NULL;
+    file = NULL;
+    /*@=mods@*/
 
     if ((rc = poptParseArgvString(spec->line, &argc, &argv))) {
 	rpmError(RPMERR_BADSPEC, _("line %d: Error parsing %%files: %s\n"),
@@ -59,8 +62,10 @@ int parseFiles(Spec spec)
     }
 
     if (poptPeekArg(optCon)) {
+	/*@-mods@*/
 	if (name == NULL)
 	    name = poptGetArg(optCon);
+	/*@=mods@*/
 	if (poptPeekArg(optCon)) {
 	    rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s\n"),
 		     spec->lineNum,
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 933401b69..331086ad1 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -322,7 +322,7 @@ static struct optionalTag {
  */
 static void fillOutMainPackage(Header h)
 	/*@globals rpmGlobalMacroContext @*/
-	/*@modifies h @*/
+	/*@modifies h, rpmGlobalMacroContext @*/
 {
     struct optionalTag *ot;
 
@@ -341,7 +341,7 @@ static void fillOutMainPackage(Header h)
 static int readIcon(Header h, const char * file)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies h, fileSystem @*/
+	/*@modifies h, rpmGlobalMacroContext, fileSystem @*/
 {
     const char *fn = NULL;
     char *icon;
@@ -450,7 +450,7 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro,
 		spec->buildRestrictions, spec->BANames, spec->BACount,
 		spec->line, spec->gotBuildRootURL,
 		pkg->header, pkg->autoProv, pkg->autoReq, pkg->icon,
-		fileSystem @*/
+		rpmGlobalMacroContext, fileSystem @*/
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
diff --git a/build/parsePrep.c b/build/parsePrep.c
index 5879383be..1728abc86 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -68,7 +68,7 @@ static int checkOwners(const char * urlfn)
 		     int reverse, int removeEmpties)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies fileSystem @*/
+	/*@modifies rpmGlobalMacroContext, fileSystem @*/
 {
     const char *fn, *urlfn;
     static char buf[BUFSIZ];
@@ -161,7 +161,7 @@ static int checkOwners(const char * urlfn)
 /*@observer@*/ static const char *doUntar(Spec spec, int c, int quietly)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies fileSystem @*/
+	/*@modifies rpmGlobalMacroContext, fileSystem @*/
 {
     const char *fn, *urlfn;
     static char buf[BUFSIZ];
@@ -280,7 +280,7 @@ static int doSetupMacro(Spec spec, char *line)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
 	/*@modifies spec->buildSubdir, spec->macros, spec->prep,
-		fileSystem @*/
+		rpmGlobalMacroContext, fileSystem @*/
 {
     char buf[BUFSIZ];
     StringBuf before;
@@ -293,9 +293,11 @@ static int doSetupMacro(Spec spec, char *line)
     int rc;
     int num;
 
+    /*@-mods@*/
     leaveDirs = skipDefaultAction = 0;
     createDir = quietly = 0;
     dirName = NULL;
+    /*@=mods@*/
 
     if ((rc = poptParseArgvString(line, &argc, &argv))) {
 	rpmError(RPMERR_BADSPEC, _("Error parsing %%setup: %s\n"),
@@ -433,7 +435,7 @@ static int doSetupMacro(Spec spec, char *line)
 static int doPatchMacro(Spec spec, char *line)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
-	/*@modifies spec->prep, fileSystem @*/
+	/*@modifies spec->prep, rpmGlobalMacroContext, fileSystem @*/
 {
     char *opt_b;
     int opt_P, opt_p, opt_R, opt_E;
diff --git a/build/parseScript.c b/build/parseScript.c
index db0af7f7d..95c88921f 100644
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -96,9 +96,11 @@ int parseScript(Spec spec, int parsePart)
     poptContext optCon = NULL;
     
     reqargs[0] = '\0';
+    /*@-mods@*/
     name = NULL;
     prog = "/bin/sh";
     file = NULL;
+    /*@=mods@*/
     
     /*@-branchstate@*/
     switch (parsePart) {
@@ -203,8 +205,10 @@ int parseScript(Spec spec, int parsePart)
     }
 
     if (poptPeekArg(optCon)) {
+	/*@-mods@*/
 	if (name == NULL)
 	    name = poptGetArg(optCon);
+	/*@=mods@*/
 	if (poptPeekArg(optCon)) {
 	    rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s\n"),
 		     spec->lineNum,
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 1727b1d3c..2835bfe54 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -118,8 +118,10 @@ static void forceIncludeFile(Spec spec, const char * fileName)
  */
 static int copyNextLine(Spec spec, OFI_t *ofi, int strip)
 	/*@globals rpmGlobalMacroContext,
-		fileSystem@*/
-	/*@modifies spec->nextline, fileSystem @*/
+		fileSystem @*/
+	/*@modifies spec->nextline, spec->nextpeekc, spec->lbuf, spec->line,
+		ofi->readPtr,
+		rpmGlobalMacroContext, fileSystem @*/
 {
     char *last;
     char ch;
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 4ec66bb97..aef25de0f 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -156,7 +156,8 @@ int readLine(Spec spec, int strip)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
 	/*@modifies spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Stop reading from spec file, freeing resources.
@@ -197,7 +198,7 @@ int parseNum(/*@null@*/ const char * line, /*@null@*/ /*@out@*/int * res)
  * @param text		description of change
  */
 void addChangelogEntry(Header h, time_t time, const char * name,
-	const char * text)
+		const char * text)
 	/*@modifies h @*/;
 
 /** \ingroup rpmbuild
@@ -211,7 +212,8 @@ int parseBuildInstallClean(Spec spec, rpmParseState parsePart)
 		fileSystem @*/
 	/*@modifies spec->build, spec->install, spec->clean, spec->macros,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse %%changelog section of a spec file.
@@ -222,8 +224,9 @@ int parseChangelog(Spec spec)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem@*/
 	/*@modifies spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl,
-		spec->packages->header, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		spec->packages->header,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse %%description section of a spec file.
@@ -235,7 +238,9 @@ int parseDescription(Spec spec)
 		fileSystem@*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, spec->st, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		spec->st,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse %%files section of a spec file.
@@ -247,7 +252,8 @@ int parseFiles(Spec spec)
 		fileSystem@*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse tags from preamble of a spec file.
@@ -260,11 +266,13 @@ int parsePreamble(Spec spec, int initialPackage)
 		fileSystem, internalState @*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->buildSubdir, spec->sl,
+		spec->buildSubdir,
 		spec->macros, spec->st, spec->buildRootURL,
 		spec->sources, spec->numSources, spec->noSource,
 		spec->buildRestrictions, spec->BANames, spec->BACount,
-		spec->gotBuildRootURL, fileSystem, internalState @*/;
+		spec->gotBuildRootURL,
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Parse %%prep section of a spec file.
@@ -276,7 +284,8 @@ int parsePrep(Spec spec)
 		fileSystem@*/
 	/*@modifies spec->prep, spec->buildSubdir, spec->macros,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse dependency relations from spec file and/or autogenerated output buffer.
@@ -304,7 +313,8 @@ int parseScript(Spec spec, int parsePart)
 		fileSystem@*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, fileSystem @*/;
+		spec->nextline, spec->nextpeekc, spec->lbuf, spec->sl,
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Evaluate boolean expression.
@@ -417,7 +427,7 @@ int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
 	/*@modifies spec->macros,
 		spec->packages->cpioList, spec->packages->fileList,
 		spec->packages->specialDoc, spec->packages->header,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Create and initialize header for source package.
@@ -439,7 +449,7 @@ int processSourceFiles(Spec spec)
 	/*@modifies spec->sourceHeader, spec->sourceCpioList,
 		spec->buildRestrictions, spec->BANames,
 		spec->packages->header,
-		fileSystem @*/;
+		rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse spec file into spec control structure.
@@ -464,7 +474,7 @@ int parseSpec(/*@out@*/ Spec * specp, const char * specFile,
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies *specp,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * @retval specp	spec file control structure
@@ -489,7 +499,7 @@ extern int (*parseSpecVec) (Spec * specp, const char * specFile,
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies *specp,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 /*@=declundef@*/
 
 /** \ingroup rpmbuild
@@ -508,7 +518,7 @@ int buildSpec(Spec spec, int what, int test)
 		spec->buildRestrictions, spec->BANames,
 		spec->packages->cpioList, spec->packages->fileList,
 		spec->packages->specialDoc, spec->packages->header,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Generate binary package(s).
@@ -520,7 +530,7 @@ int packageBinaries(Spec spec)
 		fileSystem, internalState @*/
 	/*@modifies spec->packages->header,
 		spec->sourceRpmName,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Generate source package.
@@ -532,7 +542,7 @@ int packageSources(Spec spec)
 		fileSystem, internalState @*/
 	/*@modifies spec->sourceHeader, spec->cookie,
 		spec->sourceRpmName,
-		fileSystem, internalState @*/;
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /*@=redecl@*/
 #ifdef __cplusplus
diff --git a/build/rpmspec.h b/build/rpmspec.h
index b57713aee..22b3be8f5 100644
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -220,7 +220,8 @@ int addSource(Spec spec, Package pkg, const char * field, int tag)
 	/*@globals rpmGlobalMacroContext @*/
 	/*@modifies spec->sources, spec->numSources,
 		spec->st, spec->macros,
-		pkg->icon @*/;
+		pkg->icon,
+		rpmGlobalMacroContext @*/;
 
 /** \ingroup rpmbuild
  * @param spec		spec file control structure
diff --git a/build/spec.c b/build/spec.c
index 53a26e4ab..bf7f2b4b5 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -454,7 +454,7 @@ Spec newSpec(void)
     spec->force = 0;
     spec->anyarch = 0;
 
-    spec->macros = rpmGlobalMacroContext;
+/*@i@*/	spec->macros = rpmGlobalMacroContext;
     
     return spec;
 }