Converging on lclint-3.0.17 strict level.

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

1 files changed, 28 insertions, 18 deletions

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