summaryrefslogtreecommitdiff
path: root/poptint.h
diff options
context:
space:
mode:
authorjbj <jbj>2001-01-01 23:14:52 +0000
committerjbj <jbj>2001-01-01 23:14:52 +0000
commit6ae893a59c33ca30ff53fd7bec68dc3eddf72d17 (patch)
treef6b0aec871b5ce5f597077744b96abab99a60e10 /poptint.h
parent5c317e5c54ed6e16d1cfeccf5e20f897a5edbd5c (diff)
downloadlibpopt-6ae893a59c33ca30ff53fd7bec68dc3eddf72d17.tar.gz
- use popt autohelp for rpm helper binaries.
Diffstat (limited to 'poptint.h')
-rw-r--r--poptint.h32
1 files changed, 15 insertions, 17 deletions
diff --git a/poptint.h b/poptint.h
index a37a9b9..066e143 100644
--- a/poptint.h
+++ b/poptint.h
@@ -27,12 +27,12 @@ typedef struct {
struct optionStackEntry {
int argc;
- /*@only@*/ const char ** argv;
- /*@only@*/ pbm_set * argb;
+/*@only@*/ const char ** argv;
+/*@only@*/ pbm_set * argb;
int next;
- /*@only@*/ const char * nextArg;
- /*@keep@*/ const char * nextCharArg;
- /*@dependent@*/ struct poptAlias * currAlias;
+/*@only@*/ const char * nextArg;
+/*@keep@*/ const char * nextCharArg;
+/*@dependent@*/ struct poptAlias * currAlias;
int stuffed;
};
@@ -44,30 +44,28 @@ struct execEntry {
struct poptContext_s {
struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
- /*@dependent@*/ struct optionStackEntry * os;
- /*@owned@*/ const char ** leftovers;
+/*@dependent@*/ struct optionStackEntry * os;
+/*@owned@*/ const char ** leftovers;
int numLeftovers;
int nextLeftover;
- /*@keep@*/ const struct poptOption * options;
+/*@keep@*/ const struct poptOption * options;
int restLeftover;
- /*@only@*/ const char * appName;
- /*@only@*/ struct poptAlias * aliases;
+/*@only@*/ const char * appName;
+/*@only@*/ struct poptAlias * aliases;
int numAliases;
int flags;
struct execEntry * execs;
int numExecs;
- /*@only@*/ const char ** finalArgv;
+/*@only@*/ const char ** finalArgv;
int finalArgvCount;
int finalArgvAlloced;
- /*@dependent@*/ struct execEntry * doExec;
- /*@only@*/ const char * execPath;
+/*@dependent@*/ struct execEntry * doExec;
+/*@only@*/ const char * execPath;
int execAbsolute;
- /*@only@*/ const char * otherHelp;
+/*@only@*/ const char * otherHelp;
pbm_set * arg_strip;
};
-#define xfree(_a) free((void *)_a)
-
#ifdef HAVE_LIBINTL_H
#include <libintl.h>
#endif
@@ -82,8 +80,8 @@ struct poptContext_s {
#define D_(dom, str) dgettext(dom, str)
#define POPT_(foo) D_("popt", foo)
#else
-#define POPT_(foo) (foo)
#define D_(dom, str) (str)
+#define POPT_(foo) (foo)
#endif
#define N_(foo) (foo)