lclint fiddles to annotate globals.

CVS patchset: 5106
CVS date: 2001/10/15 03:22:10

1 files changed, 61 insertions, 23 deletions

diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index ca48b5fb4..de2856bc9 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -83,6 +83,7 @@ extern "C" {
  * Destroy uid/gid caches.
  */
 void freeNames(void)
+	/*@globals internalState@*/
 	/*@modifies internalState */;
 
 /** \ingroup rpmbuild
@@ -152,6 +153,8 @@ extern /*@observer@*/ int_32 * const getBuildTime(void)	/*@*/;
  * @return		0 on success, 1 on EOF, <0 on error
  */
 int readLine(Spec spec, int strip)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem@*/
 	/*@modifies spec->fileStack, spec->readStack, spec->line, spec->lineNum,
 		spec->sl, fileSystem @*/;
 
@@ -160,7 +163,8 @@ int readLine(Spec spec, int strip)
  * @param spec		spec file control structure
  */
 void closeSpec(/*@partial@*/ Spec spec)
-	/*@modifies spec->fileStack @*/;
+	/*@globals fileSystem@*/
+	/*@modifies spec->fileStack, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Truncate comment lines.
@@ -203,9 +207,11 @@ void addChangelogEntry(Header h, time_t time, const char * name,
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parseBuildInstallClean(Spec spec, rpmParseState parsePart)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem @*/
 	/*@modifies spec->build, spec->install, spec->clean, spec->macros,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl @*/;
+		spec->sl, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse %%changelog section of a spec file.
@@ -213,9 +219,11 @@ int parseBuildInstallClean(Spec spec, rpmParseState parsePart)
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parseChangelog(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem@*/
 	/*@modifies spec->fileStack, spec->readStack, spec->line, spec->lineNum,
 		spec->sl,
-		spec->packages->header @*/;
+		spec->packages->header, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse %%description section of a spec file.
@@ -223,9 +231,11 @@ int parseChangelog(Spec spec)
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parseDescription(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem@*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl, spec->st @*/;
+		spec->sl, spec->st, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse %%files section of a spec file.
@@ -233,9 +243,11 @@ int parseDescription(Spec spec)
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parseFiles(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem@*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl @*/;
+		spec->sl, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse tags from preamble of a spec file.
@@ -244,13 +256,15 @@ int parseFiles(Spec spec)
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parsePreamble(Spec spec, int initialPackage)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
 		spec->buildSubdir, spec->sl,
 		spec->macros, spec->st, spec->buildRootURL,
 		spec->sources, spec->numSources, spec->noSource,
 		spec->buildRestrictions, spec->BANames, spec->BACount,
-		spec->gotBuildRootURL @*/;
+		spec->gotBuildRootURL, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Parse %%prep section of a spec file.
@@ -258,9 +272,11 @@ int parsePreamble(Spec spec, int initialPackage)
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parsePrep(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem@*/
 	/*@modifies spec->prep, spec->buildSubdir, spec->macros,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl @*/;
+		spec->sl, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse dependency relations from spec file and/or autogenerated output buffer.
@@ -274,7 +290,8 @@ int parsePrep(Spec spec)
  */
 int parseRCPOT(Spec spec, Package pkg, const char * field, int tag, int index,
 	       rpmsenseFlags flags)
-	/*@modifies nothing @*/;
+	/*@globals rpmGlobalMacroContext @*/
+	/*@modifies rpmGlobalMacroContext @*/;
 
 /** \ingroup rpmbuild
  * Parse %%pre et al scriptlets from a spec file.
@@ -283,9 +300,11 @@ int parseRCPOT(Spec spec, Package pkg, const char * field, int tag, int index,
  * @return		>= 0 next rpmParseState, < 0 on error
  */
 int parseScript(Spec spec, int parsePart)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem@*/
 	/*@modifies spec->packages,
 		spec->fileStack, spec->readStack, spec->line, spec->lineNum,
-		spec->sl @*/;
+		spec->sl, fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Evaluate boolean expression.
@@ -293,7 +312,9 @@ int parseScript(Spec spec, int parsePart)
  * @param expr		expression to parse
  * @return
  */
-int parseExpressionBoolean(Spec spec, const char * expr)	/*@*/;
+int parseExpressionBoolean(Spec spec, const char * expr)
+	/*@globals rpmGlobalMacroContext @*/
+	/*@modifies rpmGlobalMacroContext @*/;
 
 /** \ingroup rpmbuild
  * Evaluate string expression.
@@ -303,7 +324,8 @@ int parseExpressionBoolean(Spec spec, const char * expr)	/*@*/;
  */
 /*@unused@*/
 char * parseExpressionString(Spec spec, const char * expr)
-	/*@modifies nothing @*/;
+	/*@globals rpmGlobalMacroContext @*/
+	/*@modifies rpmGlobalMacroContext @*/;
 
 /** \ingroup rpmbuild
  * Run a build script, assembled from spec file scriptlet section.
@@ -316,7 +338,10 @@ char * parseExpressionString(Spec spec, const char * expr)
  * @return		0 on success, RPMERR_SCRIPT on failure
  */
 int doScript(Spec spec, int what, const char * name, StringBuf sb, int test)
-		/*@modifies spec->macros, fileSystem @*/;
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
+	/*@modifies spec->macros,
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Find sub-package control structure by name.
@@ -327,8 +352,8 @@ int doScript(Spec spec, int what, const char * name, StringBuf sb, int test)
  * @return		0 on success, 1 on failure
  */
 int lookupPackage(Spec spec, /*@null@*/ const char * name, int flag,
-	/*@out@*/ Package * pkg)
-		/*@modifies spec->packages, *pkg @*/;
+		/*@out@*/ Package * pkg)
+	/*@modifies spec->packages, *pkg @*/;
 
 /** \ingroup rpmbuild
  * Create and initialize package control structure.
@@ -387,10 +412,12 @@ int rpmlibNeedsFeature(Header h, const char * feature, const char * featureEVR)
  * @return		0 on success
  */
 int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies spec->macros,
 		spec->packages->cpioList, spec->packages->fileList,
 		spec->packages->specialDoc, spec->packages->header,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Create and initialize header for source package.
@@ -407,11 +434,12 @@ void initSourceHeader(Spec spec)
  * @return		0 on success
  */
 int processSourceFiles(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem @*/
 	/*@modifies spec->sourceHeader, spec->sourceCpioList,
 		spec->buildRestrictions, spec->BANames,
-		spec->packages->header @*/;
-
-/* global entry points */
+		spec->packages->header,
+		fileSystem @*/;
 
 /** \ingroup rpmbuild
  * Parse spec file into spec control structure.
@@ -433,8 +461,10 @@ int parseSpec(/*@out@*/ Spec * specp, const char * specFile,
 		/*@null@*/ const char * passPhrase,
 		/*@null@*/ char * cookie,
 		int anyarch, int force)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies *specp,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * @retval specp	spec file control structure
@@ -456,8 +486,10 @@ extern int (*parseSpecVec) (Spec * specp, const char * specFile,
 		/*@null@*/ const char * passPhrase,
 		/*@null@*/ char * cookie,
 		int anyarch, int force)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies *specp,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 /*@=declundef@*/
 
 /** \ingroup rpmbuild
@@ -468,13 +500,15 @@ extern int (*parseSpecVec) (Spec * specp, const char * specFile,
  * @return		0 on success
  */
 int buildSpec(Spec spec, int what, int test)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies spec->sourceHeader, spec->sourceCpioList, spec->cookie,
 		spec->sourceRpmName, spec->macros,
 		spec->BASpecs,
 		spec->buildRestrictions, spec->BANames,
 		spec->packages->cpioList, spec->packages->fileList,
 		spec->packages->specialDoc, spec->packages->header,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Generate binary package(s).
@@ -482,9 +516,11 @@ int buildSpec(Spec spec, int what, int test)
  * @return		0 on success
  */
 int packageBinaries(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies spec->packages->header,
 		spec->sourceRpmName,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  * Generate source package.
@@ -492,9 +528,11 @@ int packageBinaries(Spec spec)
  * @return		0 on success
  */
 int packageSources(Spec spec)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
 	/*@modifies spec->sourceHeader, spec->cookie,
 		spec->sourceRpmName,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 
 /*@=redecl@*/
 #ifdef __cplusplus