diff options
author | Erik Troan <ewt@src.gnome.org> | 1998-09-27 15:54:21 +0000 |
---|---|---|
committer | Erik Troan <ewt@src.gnome.org> | 1998-09-27 15:54:21 +0000 |
commit | 7e8d04d2ac6e9b8015a0e299ce7a7fcf27afc963 (patch) | |
tree | ec1c27f73079f398ae7059a73927e276cf943033 /support | |
parent | 79b1b4a560477b80455b7cb6a6cbdd66f048971d (diff) | |
download | shared-mime-info-7e8d04d2ac6e9b8015a0e299ce7a7fcf27afc963.tar.gz |
changed popt callbacks t get a pointer into the option table
svn path=/trunk/; revision=411
Diffstat (limited to 'support')
-rw-r--r-- | support/popt-gnome.h | 5 | ||||
-rw-r--r-- | support/popt.c | 2 | ||||
-rw-r--r-- | support/popt.h | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/support/popt-gnome.h b/support/popt-gnome.h index 50580f7c..bdedceae 100644 --- a/support/popt-gnome.h +++ b/support/popt-gnome.h @@ -55,8 +55,9 @@ extern struct poptOption poptHelpOptions[]; typedef struct poptContext_s * poptContext; typedef struct poptOption * poptOption; -typedef void (*poptCallbackType)(poptContext con, int key, const char * arg, - void * data); +typedef void (*poptCallbackType)(poptContext con, + const struct poptOption * opt, + const char * arg, void * data); poptContext poptGetContext(char * name, int argc, char ** argv, const struct poptOption * options, int flags); diff --git a/support/popt.c b/support/popt.c index 96d60537..0df31796 100644 --- a/support/popt.c +++ b/support/popt.c @@ -370,7 +370,7 @@ int poptGetNextOpt(poptContext con) { } if (cb) - cb(con, opt->val, con->os->nextArg, cbData); + cb(con, opt, con->os->nextArg, cbData); else if (opt->val) done = 1; diff --git a/support/popt.h b/support/popt.h index 50580f7c..bdedceae 100644 --- a/support/popt.h +++ b/support/popt.h @@ -55,8 +55,9 @@ extern struct poptOption poptHelpOptions[]; typedef struct poptContext_s * poptContext; typedef struct poptOption * poptOption; -typedef void (*poptCallbackType)(poptContext con, int key, const char * arg, - void * data); +typedef void (*poptCallbackType)(poptContext con, + const struct poptOption * opt, + const char * arg, void * data); poptContext poptGetContext(char * name, int argc, char ** argv, const struct poptOption * options, int flags); |