--- popt.h 2002/01/30 14:00:22 1.1
+++ popt.h 2002/03/15 08:49:49 1.2
@@ -25,7 +25,7 @@
*
* NOTICE:
* This is an automatically generated, stripped down version of the
- * POPT 1.6.3 library from Red Hat, Inc. This version is still
+ * POPT 1.6.4 library from Red Hat, Inc. This version is still
* distributed under above Open Source license, but Red Hat is no longer
* responsible for this version. Contact The OSSP Project instead.
*/
@@ -33,10 +33,6 @@
#ifndef __POPT_H__
#define __POPT_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <stdio.h>
#define POPT_OPTION_DEPTH 10
@@ -98,51 +94,55 @@
#define POPT_CONTEXT_POSIXMEHARDER (1 << 2)
#define POPT_CONTEXT_ARG_OPTS (1 << 4)
- struct popt_option {
- const char *longName;
- char shortName;
- int argInfo;
- void *arg;
- int val;
- const char *descrip;
- const char *argDescrip;
- };
-
- struct popt_alias {
- const char *longName;
- char shortName;
- int argc;
- const char **argv;
- };
-
- typedef struct popt_item_s {
- struct popt_option option;
- int argc;
- const char **argv;
- } *popt_item;
+struct popt_option {
+ const char *longName;
+ char shortName;
+ int argInfo;
+ void *arg;
+ int val;
+ const char *descrip;
+ const char *argDescrip;
+};
+
+struct popt_alias {
+ const char *longName;
+ char shortName;
+ int argc;
+ const char **argv;
+};
+
+typedef struct popt_item_s {
+ struct popt_option option;
+ int argc;
+ const char **argv;
+} *popt_item;
- extern struct popt_option popt_aliasOptions[];
+extern struct popt_option popt_aliasOptions[];
#define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, popt_aliasOptions, \
0, "Options implemented via popt alias/exec:", NULL },
- extern struct popt_option popt_helpoptions[];
+extern struct popt_option popt_helpoptions[];
#define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, popt_helpoptions, \
0, "Help options:", NULL },
#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
- typedef struct popt_context_s *popt_context;
+typedef struct popt_context_s *popt_context;
#ifndef __cplusplus
- typedef struct popt_option *popt_option;
+typedef struct popt_option *popt_option;
#endif
- enum popt_callbackreason { POPT_CALLBACK_REASON_PRE,
- POPT_CALLBACK_REASON_POST,
- POPT_CALLBACK_REASON_OPTION
- };
+enum popt_callbackreason { POPT_CALLBACK_REASON_PRE,
+ POPT_CALLBACK_REASON_POST,
+ POPT_CALLBACK_REASON_OPTION
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef void (*popt_callbacktype) (popt_context con,
enum popt_callbackreason reason,
@@ -156,7 +156,8 @@
void popt_resetcontext(popt_context con);
- int popt_getnextopt(popt_context con);
+ int popt_getnextopt(popt_context con)
+ ;
const char *popt_getoptarg(popt_context con);
@@ -176,9 +177,11 @@
int popt_additem(popt_context con, popt_item newItem, int flags);
- int popt_readconfigfile(popt_context con, const char *fn);
+ int popt_readconfigfile(popt_context con, const char *fn)
+ ;
- int popt_readdefaultconfig(popt_context con, int useEnv);
+ int popt_readdefaultconfig(popt_context con, int useEnv)
+ ;
int popt_dupargv(int argc, const char **argv,
int *argcPtr, const char ***argvPtr);
@@ -191,9 +194,11 @@
void popt_setexecpath(popt_context con, const char *path,
int allowAbsolute);
- void popt_printhelp(popt_context con, FILE * fp, int flags);
+ void popt_printhelp(popt_context con, FILE * fp, int flags)
+ ;
- void popt_printusage(popt_context con, FILE * fp, int flags);
+ void popt_printusage(popt_context con, FILE * fp, int flags)
+ ;
void popt_setotheroptionhelp(popt_context con, const char *text);
|
