Use G_OPTION_ENTRY_NULL macro.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2021-05-16 11:21:40 +03:00
parent f657d92e52
commit de16ae9180
3 changed files with 9 additions and 10 deletions

View File

@ -3,6 +3,11 @@
/*** typedefs(not structures) and defined constants **********************************************/ /*** typedefs(not structures) and defined constants **********************************************/
#ifndef G_OPTION_ENTRY_NULL
#define G_OPTION_ENTRY_NULL \
{ NULL, '\0', 0, 0, NULL, NULL, NULL }
#endif /* G_OPTION_ENTRY_NULL */
/*** enums ***************************************************************************************/ /*** enums ***************************************************************************************/
/*** structures declarations (and typedefs of structures)*****************************************/ /*** structures declarations (and typedefs of structures)*****************************************/

View File

@ -194,9 +194,7 @@ static const GOptionEntry argument_main_table[] = {
N_("<file> ...") N_("<file> ...")
}, },
{ G_OPTION_ENTRY_NULL
NULL, '\0', 0, 0, NULL, NULL, NULL /* Complete struct initialization */
}
/* *INDENT-ON* */ /* *INDENT-ON* */
}; };
@ -279,9 +277,7 @@ static const GOptionEntry argument_terminal_table[] = {
NULL NULL
}, },
{ G_OPTION_ENTRY_NULL
NULL, '\0', 0, 0, NULL, NULL, NULL /* Complete struct initialization */
}
/* *INDENT-ON* */ /* *INDENT-ON* */
}; };
@ -321,9 +317,7 @@ static const GOptionEntry argument_color_table[] = {
N_("<string>") N_("<string>")
}, },
{ G_OPTION_ENTRY_NULL
NULL, '\0', 0, 0, NULL, NULL, NULL /* Complete struct initialization */
}
/* *INDENT-ON* */ /* *INDENT-ON* */
}; };

View File

@ -83,7 +83,7 @@ static GOptionEntry entries[] = {
NULL}, NULL},
{"format", 'f', 0, G_OPTION_ARG_CALLBACK, parse_format_name_argument, {"format", 'f', 0, G_OPTION_ARG_CALLBACK, parse_format_name_argument,
"Output format. Default: ls.", "<ls|yaml>"}, "Output format. Default: ls.", "<ls|yaml>"},
{NULL, '\0', 0, 0, NULL, NULL, NULL} /* Make the compiler shut up by initializing everything. */ G_OPTION_ENTRY_NULL
}; };
/*** file scope functions ************************************************************************/ /*** file scope functions ************************************************************************/