fix nasty warnings of -Wextra

SVN revision: 41066
This commit is contained in:
Gustavo Sverzut Barbieri 2009-06-17 01:41:54 +00:00
parent 3c6e35dd10
commit d89cf04e8d
1 changed files with 16 additions and 6 deletions

View File

@ -149,6 +149,7 @@ extern "C" {
const char *const *choices; /* NULL terminated. */ const char *const *choices; /* NULL terminated. */
const Ecore_Getopt_Type append_type; const Ecore_Getopt_Type append_type;
const Ecore_Getopt_Desc_Callback callback; const Ecore_Getopt_Desc_Callback callback;
const void *dummy;
} action_param; } action_param;
}; };
@ -328,7 +329,8 @@ extern "C" {
{.append_type = type}} {.append_type = type}}
#define ECORE_GETOPT_COUNT(shortname, longname, help) \ #define ECORE_GETOPT_COUNT(shortname, longname, help) \
{shortname, longname, help, NULL, ECORE_GETOPT_ACTION_COUNT} {shortname, longname, help, NULL, ECORE_GETOPT_ACTION_COUNT, \
{.dummy = NULL}}
#define ECORE_GETOPT_CALLBACK_FULL(shortname, longname, help, metavar, callback_func, callback_data, argument_requirement, default_value) \ #define ECORE_GETOPT_CALLBACK_FULL(shortname, longname, help, metavar, callback_func, callback_data, argument_requirement, default_value) \
{shortname, longname, help, metavar, ECORE_GETOPT_ACTION_CALLBACK, \ {shortname, longname, help, metavar, ECORE_GETOPT_ACTION_CALLBACK, \
@ -347,17 +349,25 @@ extern "C" {
#define ECORE_GETOPT_HELP(shortname, longname) \ #define ECORE_GETOPT_HELP(shortname, longname) \
{shortname, longname, "show this message.", NULL, \ {shortname, longname, "show this message.", NULL, \
ECORE_GETOPT_ACTION_HELP} ECORE_GETOPT_ACTION_HELP, \
{.dummy = NULL}}
#define ECORE_GETOPT_VERSION(shortname, longname) \ #define ECORE_GETOPT_VERSION(shortname, longname) \
{shortname, longname, "show program version.", NULL, \ {shortname, longname, "show program version.", NULL, \
ECORE_GETOPT_ACTION_VERSION} ECORE_GETOPT_ACTION_VERSION, \
{.dummy = NULL}}
#define ECORE_GETOPT_COPYRIGHT(shortname, longname) \ #define ECORE_GETOPT_COPYRIGHT(shortname, longname) \
{shortname, longname, "show copyright.", NULL, \ {shortname, longname, "show copyright.", NULL, \
ECORE_GETOPT_ACTION_COPYRIGHT} ECORE_GETOPT_ACTION_COPYRIGHT, \
{.dummy = NULL}}
#define ECORE_GETOPT_LICENSE(shortname, longname) \ #define ECORE_GETOPT_LICENSE(shortname, longname) \
{shortname, longname, "show license.", NULL, \ {shortname, longname, "show license.", NULL, \
ECORE_GETOPT_ACTION_LICENSE} ECORE_GETOPT_ACTION_LICENSE, \
#define ECORE_GETOPT_SENTINEL {0, NULL} {.dummy = NULL}}
#define ECORE_GETOPT_SENTINEL {0, NULL, NULL, NULL, 0, {.dummy = NULL}}
#define ECORE_GETOPT_VALUE_STR(val) {.strp = &(val)} #define ECORE_GETOPT_VALUE_STR(val) {.strp = &(val)}
#define ECORE_GETOPT_VALUE_BOOL(val) {.boolp = &(val)} #define ECORE_GETOPT_VALUE_BOOL(val) {.boolp = &(val)}