summaryrefslogtreecommitdiff
path: root/popt
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-07-08 14:21:26 +0000
committerjbj <devnull@localhost>2002-07-08 14:21:26 +0000
commit241fad12870c58bd76468267f2816d409dbc7e57 (patch)
tree74806f5c8a6c458ba922b6df8550dfed0d3918c3 /popt
parenta273ea6a095daa16e663d96e474c75115c3c2bdc (diff)
downloadrpm-241fad12870c58bd76468267f2816d409dbc7e57.tar.gz
rpm-241fad12870c58bd76468267f2816d409dbc7e57.tar.bz2
rpm-241fad12870c58bd76468267f2816d409dbc7e57.zip
Propagate splint-3.0.1.7 close(2) internalState annotation throughout.
CVS patchset: 5542 CVS date: 2002/07/08 14:21:26
Diffstat (limited to 'popt')
-rw-r--r--popt/popt.c3
-rw-r--r--popt/popt.h16
-rw-r--r--popt/test1.c4
3 files changed, 12 insertions, 11 deletions
diff --git a/popt/popt.c b/popt/popt.c
index d2dffa715..d4b2dc2f3 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -355,7 +355,8 @@ static int handleAlias(/*@special@*/ poptContext con,
/*@-bounds -boundswrite @*/
static int execCommand(poptContext con)
- /*@*/
+ /*@globals internalState @*/
+ /*@modifies internalState @*/
{
poptItem item = con->doExec;
const char ** argv;
diff --git a/popt/popt.h b/popt/popt.h
index c756061dc..fad30bc82 100644
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -241,8 +241,8 @@ void poptResetContext(/*@null@*/poptContext con)
* @return next option val, -1 on last item, POPT_ERROR_* on error
*/
int poptGetNextOpt(/*@null@*/poptContext con)
- /*@globals fileSystem@*/
- /*@modifies con, fileSystem @*/;
+ /*@globals fileSystem, internalState @*/
+ /*@modifies con, fileSystem, internalState @*/;
/*@-redecl@*/
/** \ingroup popt
@@ -334,9 +334,9 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
* @return 0 on success, POPT_ERROR_ERRNO on failure
*/
int poptReadConfigFile(poptContext con, const char * fn)
- /*@globals fileSystem@*/
- /*@modifies fileSystem,
- con->execs, con->numExecs @*/;
+ /*@globals fileSystem, internalState @*/
+ /*@modifies con->execs, con->numExecs,
+ fileSystem, internalState @*/;
/** \ingroup popt
* Read default configuration from /etc/popt and $HOME/.popt.
@@ -345,9 +345,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
* @return 0 on success, POPT_ERROR_ERRNO on failure
*/
int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
- /*@globals fileSystem@*/
- /*@modifies fileSystem,
- con->execs, con->numExecs @*/;
+ /*@globals fileSystem, internalState @*/
+ /*@modifies con->execs, con->numExecs,
+ fileSystem, internalState @*/;
/** \ingroup popt
* Duplicate an argument array.
diff --git a/popt/test1.c b/popt/test1.c
index 8d84144df..a41ee09a0 100644
--- a/popt/test1.c
+++ b/popt/test1.c
@@ -175,8 +175,8 @@ static void resetVars(void)
}
int main(int argc, const char ** argv)
- /*@globals pass2, fileSystem @*/
- /*@modifies pass2, fileSystem @*/
+ /*@globals pass2, fileSystem, internalState @*/
+ /*@modifies pass2, fileSystem, internalState @*/
{
int rc;
int ec = 0;