diff options
| author | jbj <devnull@localhost> | 2003-12-27 02:40:25 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-12-27 02:40:25 +0000 |
| commit | 51ae7c0fb086b6467a55a40f3a30e6fb8621dbd6 (patch) | |
| tree | 08703430cdd1261175ecb08e79fdb650162b96e3 /popt | |
| parent | 1aefecc638725d827eac1d1c5de8e0a36738638c (diff) | |
| download | rpm-51ae7c0fb086b6467a55a40f3a30e6fb8621dbd6.tar.gz | |
splint fiddles.
CVS patchset: 7030
CVS date: 2003/12/27 02:40:25
Diffstat (limited to 'popt')
| -rw-r--r-- | popt/popt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/popt/popt.c b/popt/popt.c index 357e01b2c..5226062af 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -70,8 +70,10 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt) if (opt->arg == NULL) continue; /* XXX program error. */ if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) { void * arg = opt->arg; +/*@-branchstate@*/ /* XXX sick hack to preserve pretense of ABI. */ if (arg == poptHelpOptions) arg = poptHelpOptionsI18N; +/*@=branchstate@*/ /* Recurse on included sub-tables. */ invokeCallbacksPRE(con, arg); } else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK && @@ -96,8 +98,10 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt) if (opt->arg == NULL) continue; /* XXX program error. */ if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) { void * arg = opt->arg; +/*@-branchstate@*/ /* XXX sick hack to preserve pretense of ABI. */ if (arg == poptHelpOptions) arg = poptHelpOptionsI18N; +/*@=branchstate@*/ /* Recurse on included sub-tables. */ invokeCallbacksPOST(con, arg); } else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK && @@ -126,8 +130,10 @@ static void invokeCallbacksOPTION(poptContext con, for (; opt->longName || opt->shortName || opt->arg; opt++) { if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) { void * arg = opt->arg; +/*@-branchstate@*/ /* XXX sick hack to preserve pretense of ABI. */ if (arg == poptHelpOptions) arg = poptHelpOptionsI18N; +/*@=branchstate@*/ /* Recurse on included sub-tables. */ if (opt->arg != NULL) /* XXX program error */ invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty); @@ -482,8 +488,10 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, const struct poptOption * opt2; void * arg = opt->arg; +/*@-branchstate@*/ /* XXX sick hack to preserve pretense of ABI. */ if (arg == poptHelpOptions) arg = poptHelpOptionsI18N; +/*@=branchstate@*/ /* Recurse on included sub-tables. */ if (arg == NULL) continue; /* XXX program error */ opt2 = findOption(arg, longName, shortName, callback, |