diff options
| author | ewt <devnull@localhost> | 1998-12-29 02:35:08 +0000 |
|---|---|---|
| committer | ewt <devnull@localhost> | 1998-12-29 02:35:08 +0000 |
| commit | d3bd733a950b73d36fa5bea2e033fad3f5977184 (patch) | |
| tree | e4f520641d94ac1434a1811631870d668dce972f /popt | |
| parent | 35381371cda1d98647998f738a8735449a7c4fd3 (diff) | |
| download | librpm-tizen-d3bd733a950b73d36fa5bea2e033fad3f5977184.tar.gz librpm-tizen-d3bd733a950b73d36fa5bea2e033fad3f5977184.tar.bz2 librpm-tizen-d3bd733a950b73d36fa5bea2e033fad3f5977184.zip | |
fixed memset() in help message generation (Dale Hawkins)
added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins)
CVS patchset: 2618
CVS date: 1998/12/29 02:35:08
Diffstat (limited to 'popt')
| -rw-r--r-- | popt/CHANGES | 4 | ||||
| -rw-r--r-- | popt/po/popt.pot | 2 | ||||
| -rw-r--r-- | popt/popt.h | 8 | ||||
| -rw-r--r-- | popt/popthelp.c | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/popt/CHANGES b/popt/CHANGES index 4f4885eec..82227f22c 100644 --- a/popt/CHANGES +++ b/popt/CHANGES @@ -1,3 +1,7 @@ +1.2.2 -> 1.2.3 + - fixed memset() in help message generation (Dale Hawkins) + - added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins) + 1.2.1 -> 1.2.2 - fixed bug in chaind alias happens which seems to have only affected --triggers in rpm diff --git a/popt/po/popt.pot b/popt/po/popt.pot index 51c452b5a..88981be71 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-12-11 12:08-0500\n" +"POT-Creation-Date: 1998-12-28 21:37-0500\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/popt/popt.h b/popt/popt.h index 069cab112..c74253313 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -5,6 +5,10 @@ #ifndef H_POPT #define H_POPT +#ifdef __cplusplus +extern "C" { +#endif + #include <stdio.h> /* for FILE * */ #define POPT_OPTION_DEPTH 10 @@ -112,4 +116,8 @@ void poptPrintUsage(poptContext con, FILE * f, int flags); void poptSetOtherOptionHelp(poptContext con, const char * text); const char * poptGetInvocationName(poptContext con); +#ifdef __cplusplus +} +#endif + #endif diff --git a/popt/popthelp.c b/popt/popthelp.c index c45464035..2b5a13c9e 100644 --- a/popt/popthelp.c +++ b/popt/popthelp.c @@ -261,7 +261,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * f, if (!str) { str = s; - memset(str, 0, sizeof(str)); + memset(str, 0, sizeof(s)); } while (opt->longName || opt->shortName || opt->arg) { |