diff options
author | jbj <devnull@localhost> | 2003-11-23 19:50:52 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2003-11-23 19:50:52 +0000 |
commit | 3dcfeb3f9aaf003f29d2c8c0c3a545953f529c08 (patch) | |
tree | a78f3112c1c5b7b5c8cd2ce4307056c3db758c35 /popt | |
parent | fda9ddca9bcd46cefc145c14cfd901906600c9d2 (diff) | |
download | rpm-3dcfeb3f9aaf003f29d2c8c0c3a545953f529c08.tar.gz |
Merge changes from rpm-4.2.1 development.
CVS patchset: 6959
CVS date: 2003/11/23 19:50:52
Diffstat (limited to 'popt')
-rw-r--r-- | popt/.splintrc | 3 | ||||
-rw-r--r-- | popt/popt.h | 12 | ||||
-rw-r--r-- | popt/popthelp.c | 3 | ||||
-rw-r--r-- | popt/system.h | 6 |
4 files changed, 15 insertions, 9 deletions
diff --git a/popt/.splintrc b/popt/.splintrc index 3f9490c29..e0277655a 100644 --- a/popt/.splintrc +++ b/popt/.splintrc @@ -3,7 +3,6 @@ #+partial +forcehints -#-warnunixlib -warnposix +unixlib @@ -17,13 +16,11 @@ -bufferoverflowhigh # --- +partial artifacts --fcnuse # 7 # --- not-yet at strict level -bitwisesigned # 75 -elseifcomplete # 18 -exportfcn # 25 --globs # 12 <ctype.h> -ifblock # 202 -namechecks # 206 -ptrarith # 43 diff --git a/popt/popt.h b/popt/popt.h index d55c0fe86..7be75de38 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -229,7 +229,8 @@ typedef void (*poptCallbackType) (poptContext con, * @param flags or'd POPT_CONTEXT_* bits * @return initialized popt context */ -/*@only@*/ /*@null@*/ poptContext poptGetContext( +/*@only@*/ /*@null@*/ +poptContext poptGetContext( /*@dependent@*/ /*@keep@*/ const char * name, int argc, /*@dependent@*/ /*@keep@*/ const char ** argv, /*@dependent@*/ /*@keep@*/ const struct poptOption * options, @@ -258,7 +259,7 @@ int poptGetNextOpt(/*@null@*/poptContext con) * @param con context * @return option argument, NULL if no argument is available */ -/*@observer@*/ /*@null@*/ +/*@observer@*/ /*@null@*/ /*@unused@*/ const char * poptGetOptArg(/*@null@*/poptContext con) /*@modifies con @*/; @@ -267,7 +268,7 @@ const char * poptGetOptArg(/*@null@*/poptContext con) * @param con context * @return next argument, NULL if no argument is available */ -/*@observer@*/ /*@null@*/ +/*@observer@*/ /*@null@*/ /*@unused@*/ const char * poptGetArg(/*@null@*/poptContext con) /*@modifies con @*/; @@ -276,7 +277,7 @@ const char * poptGetArg(/*@null@*/poptContext con) * @param con context * @return current argument, NULL if no argument is available */ -/*@observer@*/ /*@null@*/ +/*@observer@*/ /*@null@*/ /*@unused@*/ const char * poptPeekArg(/*@null@*/poptContext con) /*@*/; @@ -314,6 +315,7 @@ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con) * @param argv argument array, NULL terminated * @return 0 on success, POPT_ERROR_OPTSTOODEEP on failure */ +/*@unused@*/ int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv) /*@modifies con @*/; @@ -357,6 +359,7 @@ int poptReadConfigFile(poptContext con, const char * fn) * @param useEnv (unused) * @return 0 on success, POPT_ERROR_ERRNO on failure */ +/*@unused@*/ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) /*@globals fileSystem, internalState @*/ /*@modifies con->execs, con->numExecs, @@ -460,6 +463,7 @@ const char *const poptStrerror(const int error) * @param path single path to search for executables * @param allowAbsolute absolute paths only? */ +/*@unused@*/ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) /*@modifies con @*/; diff --git a/popt/popthelp.c b/popt/popthelp.c index c7dd15150..8d4ab6a3b 100644 --- a/popt/popthelp.c +++ b/popt/popthelp.c @@ -54,6 +54,9 @@ struct poptOption poptAliasOptions[] = { /*@-castfcnptr@*/ /*@observer@*/ /*@unchecked@*/ struct poptOption poptHelpOptions[] = { +/*@-readonlytrans@*/ + { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL}, +/*@=readonlytrans@*/ { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL }, { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL }, { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL }, diff --git a/popt/system.h b/popt/system.h index 685860c33..c3d46cba8 100644 --- a/popt/system.h +++ b/popt/system.h @@ -37,7 +37,8 @@ extern __const __int32_t *__ctype_toupper; #if defined(__LCLINT__) /*@-declundef -incondefs @*/ /* LCL: missing annotation */ -/*@only@*/ /*@out@*/ void * alloca (size_t __size) +/*@only@*/ /*@out@*/ +void * alloca (size_t __size) /*@ensures MaxSet(result) == (__size - 1) @*/ /*@*/; /*@=declundef =incondefs @*/ @@ -61,7 +62,8 @@ char *alloca (); #endif /*@-redecl -redef@*/ -/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str) +/*@mayexit@*/ /*@only@*/ /*@unused@*/ +char * xstrdup (const char *str) /*@*/; /*@=redecl =redef@*/ |