RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: popt Date: 14-Jun-2007 10:08:30
Branch: HEAD Handle: 2007061409083000
Modified files:
popt popthelp.c
Log:
the POPT_ARG_CALLBACK argument 'displayArgs' is already a function as
in ISO C the plain use of a function name always coerces into a
function pointer. The use oft the '&' is both confusing and useless
(and perhaps some compilers might even at least warn about this bad
usage).
Summary:
Revision Changes Path
1.56 +2 -2 popt/popthelp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/popthelp.c
============================================================================
$ cvs diff -u -r1.55 -r1.56 popthelp.c
--- popt/popthelp.c 14 Jun 2007 08:00:39 -0000 1.55
+++ popt/popthelp.c 14 Jun 2007 08:08:30 -0000 1.56
@@ -64,7 +64,7 @@
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
struct poptOption poptHelpOptions[] = {
- { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL },
+ { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
{ "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
{ "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"),
NULL },
POPT_TABLEEND
@@ -75,7 +75,7 @@
/[EMAIL PROTECTED]@*/
{ NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
/[EMAIL PROTECTED]@*/
- { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL },
+ { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
{ "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
{ "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"),
NULL },
#ifdef NOTYET
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
