summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/popt.pot2
-rw-r--r--po/ro.po2
-rw-r--r--po/sk.po2
-rw-r--r--popt.312
-rw-r--r--popt.c12
-rw-r--r--popt.h6
-rw-r--r--test1.c2
-rw-r--r--test2.c2
8 files changed, 20 insertions, 20 deletions
diff --git a/po/popt.pot b/po/popt.pot
index 6793fcf..7e9bfbf 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-25 16:06-0400\n"
+"POT-Creation-Date: 1999-10-26 13:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index f01b2de..0f7b805 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-10-22 17:29-0400\n"
+"POT-Creation-Date: 1999-10-26 13:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 712b63e..1f492ee 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-10-22 17:29-0400\n"
+"POT-Creation-Date: 1999-10-26 13:07-0400\n"
"PO-Revision-Date: 1999-08-04 21:40+0200\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/popt.3 b/popt.3
index 96848d3..b07b394 100644
--- a/popt.3
+++ b/popt.3
@@ -6,7 +6,7 @@ popt \- Parse command line options
.B #include <popt.h>
.sp
.BI "poptContext poptGetContext(const char * " name ", int " argc ,
-.BI " har ** "argv ,
+.BI " const char ** "argv ,
.BI " const struct poptOption * " options ,
.BI " int " flags );
.sp
@@ -16,9 +16,9 @@ popt \- Parse command line options
.sp
.BI "int poptGetNextOpt(poptContext " con );
.sp
-.BI "char * poptGetOptArg(poptContext " con );
+.BI "const char * poptGetOptArg(poptContext " con );
.sp
-.BI "char * poptGetArg(poptContext " con );
+.BI "const char * poptGetArg(poptContext " con );
.sp
.BI "const char * poptPeekArg(poptContext " con );
.sp
@@ -246,7 +246,7 @@ modified outside the popt library.
.sp
.nf
.BI "poptContext poptGetContext(const char * " name ", int "argc ",
-.BI " char ** "argv ",
+.BI " const char ** "argv ",
.BI " const struct poptOption * "options ",
.BI " int "flags ");"
.fi
@@ -333,7 +333,7 @@ ways to discover them. One is to ask popt to fill in a variable with the
.sp
.nf
.B #include <popt.h>
-.BI "char * poptGetOptArg(poptContext " con ");"
+.BI "const char * poptGetOptArg(poptContext " con ");"
.fi
.sp
This function returns the argument given for the final option returned by
@@ -347,7 +347,7 @@ of leftover arguments. Three functions allow applications to access such
arguments:
.nf
.HP
-.BI "char * poptGetArg(poptContext " con ");"
+.BI "const char * poptGetArg(poptContext " con ");"
.fi
This function returns the next leftover argument and marks it as
processed.
diff --git a/popt.c b/popt.c
index 3fb54f7..75c8b92 100644
--- a/popt.c
+++ b/popt.c
@@ -43,7 +43,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table,
}
}
-poptContext poptGetContext(const char * name, int argc, char ** argv,
+poptContext poptGetContext(const char * name, int argc, const char ** argv,
const struct poptOption * options, int flags) {
poptContext con = malloc(sizeof(*con));
@@ -51,7 +51,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
con->os = con->optionStack;
con->os->argc = argc;
- con->os->argv = (const char **) argv; /* XXX don't change the API */
+ con->os->argv = argv;
con->os->argb = NULL;
if (!(flags & POPT_CONTEXT_KEEP_FIRST))
@@ -569,15 +569,15 @@ int poptGetNextOpt(poptContext con)
return opt->val;
}
-char * poptGetOptArg(poptContext con) {
- char * ret = (char *)con->os->nextArg; /* XXX don't change the API */
+const char * poptGetOptArg(poptContext con) {
+ const char * ret = con->os->nextArg;
con->os->nextArg = NULL;
return ret;
}
-char * poptGetArg(poptContext con) {
+const char * poptGetArg(poptContext con) {
if (con->numLeftovers == con->nextLeftover) return NULL;
- return (char *)con->leftovers[con->nextLeftover++]; /* XXX don't change the API */
+ return con->leftovers[con->nextLeftover++];
}
const char * poptPeekArg(poptContext con) {
diff --git a/popt.h b/popt.h
index b1e58fa..5046fad 100644
--- a/popt.h
+++ b/popt.h
@@ -86,16 +86,16 @@ typedef void (*poptCallbackType)(poptContext con,
const char * arg, const void * data);
/*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name,
- int argc, /*@keep@*/ char ** argv,
+ int argc, /*@keep@*/ const char ** argv,
/*@keep@*/ const struct poptOption * options, int flags);
void poptResetContext(poptContext con);
/* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
int poptGetNextOpt(poptContext con);
/* returns NULL if no argument is available */
-/*@observer@*/ /*@null@*/ char * poptGetOptArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetOptArg(poptContext con);
/* returns NULL if no more options are available */
-/*@observer@*/ /*@null@*/ char * poptGetArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetArg(poptContext con);
/*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con);
/*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con);
/* returns the option which caused the most recent error */
diff --git a/test1.c b/test1.c
index 68ec7fd..416d59e 100644
--- a/test1.c
+++ b/test1.c
@@ -66,7 +66,7 @@ static void resetVars(void)
pass2 = 0;
}
-int main(int argc, char ** argv) {
+int main(int argc, const char ** argv) {
int rc;
int ec = 0;
poptContext optCon;
diff --git a/test2.c b/test2.c
index 5deb89d..f4e4bae 100644
--- a/test2.c
+++ b/test2.c
@@ -46,7 +46,7 @@ char *fax = NULL;
int
-main(int argc, char**argv ) {
+main(int argc, const char ** argv) {
poptContext optCon; /* context for parsing command-line options */
struct poptOption userOptionsTable[] = {
View Lorry Controller Status