summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Troan <ewt@src.gnome.org>1997-02-17 20:20:59 +0000
committerErik Troan <ewt@src.gnome.org>1997-02-17 20:20:59 +0000
commit8636f5b0ac4a6a12a63a20b4e049942f1c58d0e6 (patch)
treea9d7a0a52768d251cb02499f6a08b0867501e437
parentd8741588589769b5773c544580171f62a5d8e6c5 (diff)
downloadgnome-common-8636f5b0ac4a6a12a63a20b4e049942f1c58d0e6.tar.gz
1) added poptStuffArgs()
2) added shortName to popt aliases svn path=/trunk/; revision=9
-rw-r--r--support/popt-gnome.h6
-rw-r--r--support/popt.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/support/popt-gnome.h b/support/popt-gnome.h
index 1dc03b1..1b208d4 100644
--- a/support/popt-gnome.h
+++ b/support/popt-gnome.h
@@ -25,9 +25,10 @@ struct poptOption {
};
struct poptAlias {
- const char * longName;
+ char * longName; /* may be NULL */
+ char shortName; /* may be '\0' */
int argc;
- char ** argv;
+ char ** argv; /* must be free()able */
};
typedef struct poptContext_s * poptContext;
@@ -47,6 +48,7 @@ char ** poptGetArgs(poptContext con);
/* returns the option which caused the most recent error */
char * poptBadOption(poptContext con, int flags);
void poptFreeContext(poptContext con);
+int poptStuffArgs(poptContext con, char ** argv);
int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
int poptReadConfigFile(poptContext con, char * fn);
/* like above, but reads /etc/popt and $HOME/.popt along with environment
diff --git a/support/popt.h b/support/popt.h
index 1dc03b1..1b208d4 100644
--- a/support/popt.h
+++ b/support/popt.h
@@ -25,9 +25,10 @@ struct poptOption {
};
struct poptAlias {
- const char * longName;
+ char * longName; /* may be NULL */
+ char shortName; /* may be '\0' */
int argc;
- char ** argv;
+ char ** argv; /* must be free()able */
};
typedef struct poptContext_s * poptContext;
@@ -47,6 +48,7 @@ char ** poptGetArgs(poptContext con);
/* returns the option which caused the most recent error */
char * poptBadOption(poptContext con, int flags);
void poptFreeContext(poptContext con);
+int poptStuffArgs(poptContext con, char ** argv);
int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
int poptReadConfigFile(poptContext con, char * fn);
/* like above, but reads /etc/popt and $HOME/.popt along with environment