mu-config: small cleanup

No need for (void) in c++ signatures
This commit is contained in:
Dirk-Jan C. Binnema 2021-02-15 18:40:54 +02:00
parent 5e359fb739
commit af1734f60b
1 changed files with 22 additions and 23 deletions

View File

@ -77,7 +77,7 @@ get_output_format (const char *formatstr)
static void static void
set_group_mu_defaults (void) set_group_mu_defaults ()
{ {
/* If muhome is not set, we use the XDG Base Directory Specification /* If muhome is not set, we use the XDG Base Directory Specification
* locations. */ * locations. */
@ -94,7 +94,7 @@ set_group_mu_defaults (void)
} }
static GOptionGroup* static GOptionGroup*
config_options_group_mu (void) config_options_group_mu ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -125,7 +125,7 @@ config_options_group_mu (void)
} }
static void static void
set_group_init_defaults (void) set_group_init_defaults ()
{ {
if (!MU_CONFIG.maildir) if (!MU_CONFIG.maildir)
MU_CONFIG.maildir = mu_util_guess_maildir(); MU_CONFIG.maildir = mu_util_guess_maildir();
@ -134,7 +134,7 @@ set_group_init_defaults (void)
} }
static GOptionGroup* static GOptionGroup*
config_options_group_init (void) config_options_group_init ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -178,7 +178,7 @@ index_post_parse_func (GOptionContext *context, GOptionGroup *group,
static GOptionGroup* static GOptionGroup*
config_options_group_index (void) config_options_group_index ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -205,15 +205,14 @@ config_options_group_index (void)
} }
static void static void
set_group_find_defaults (void) set_group_find_defaults ()
{ {
/* note, when no fields are specified, we use /* note, when no fields are specified, we use date-from-subject */
* date-from-subject, and sort descending by date. If fields
* *are* specified, we sort in ascending order. */
if (!MU_CONFIG.fields || !*MU_CONFIG.fields) { if (!MU_CONFIG.fields || !*MU_CONFIG.fields) {
MU_CONFIG.fields = g_strdup ("d f s"); MU_CONFIG.fields = g_strdup ("d f s");
if (!MU_CONFIG.sortfield) if (!MU_CONFIG.sortfield) {
MU_CONFIG.sortfield = g_strdup ("d"); MU_CONFIG.sortfield = g_strdup ("d");
}
} }
if (!MU_CONFIG.formatstr) /* by default, use plain output */ if (!MU_CONFIG.formatstr) /* by default, use plain output */
@ -226,7 +225,7 @@ set_group_find_defaults (void)
} }
static GOptionGroup* static GOptionGroup*
config_options_group_find (void) config_options_group_find ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -276,7 +275,7 @@ config_options_group_find (void)
} }
static GOptionGroup * static GOptionGroup *
config_options_group_mkdir (void) config_options_group_mkdir ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -296,7 +295,7 @@ config_options_group_mkdir (void)
} }
static void static void
set_group_cfind_defaults (void) set_group_cfind_defaults ()
{ {
if (!MU_CONFIG.formatstr) /* by default, use plain output */ if (!MU_CONFIG.formatstr) /* by default, use plain output */
MU_CONFIG.format = MU_CONFIG_FORMAT_PLAIN; MU_CONFIG.format = MU_CONFIG_FORMAT_PLAIN;
@ -305,7 +304,7 @@ set_group_cfind_defaults (void)
} }
static GOptionGroup * static GOptionGroup *
config_options_group_cfind (void) config_options_group_cfind ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -327,7 +326,7 @@ config_options_group_cfind (void)
} }
static GOptionGroup * static GOptionGroup *
config_options_group_script (void) config_options_group_script ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -345,7 +344,7 @@ config_options_group_script (void)
} }
static void static void
set_group_view_defaults (void) set_group_view_defaults ()
{ {
if (!MU_CONFIG.formatstr) /* by default, use plain output */ if (!MU_CONFIG.formatstr) /* by default, use plain output */
MU_CONFIG.format = MU_CONFIG_FORMAT_PLAIN; MU_CONFIG.format = MU_CONFIG_FORMAT_PLAIN;
@ -356,7 +355,7 @@ set_group_view_defaults (void)
/* crypto options are used in a few different commands */ /* crypto options are used in a few different commands */
static GOptionEntry* static GOptionEntry*
crypto_option_entries (void) crypto_option_entries ()
{ {
static GOptionEntry entries[] = { static GOptionEntry entries[] = {
{"auto-retrieve", 'r', 0, G_OPTION_ARG_NONE, {"auto-retrieve", 'r', 0, G_OPTION_ARG_NONE,
@ -373,7 +372,7 @@ crypto_option_entries (void)
} }
static GOptionGroup * static GOptionGroup *
config_options_group_view (void) config_options_group_view ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -398,7 +397,7 @@ config_options_group_view (void)
} }
static void static void
set_group_extract_defaults (void) set_group_extract_defaults ()
{ {
if (!MU_CONFIG.targetdir) if (!MU_CONFIG.targetdir)
MU_CONFIG.targetdir = g_strdup ("."); MU_CONFIG.targetdir = g_strdup (".");
@ -408,7 +407,7 @@ set_group_extract_defaults (void)
static GOptionGroup* static GOptionGroup*
config_options_group_extract (void) config_options_group_extract ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -439,7 +438,7 @@ config_options_group_extract (void)
static GOptionGroup* static GOptionGroup*
config_options_group_verify (void) config_options_group_verify ()
{ {
GOptionGroup *og; GOptionGroup *og;
og = g_option_group_new("verify", og = g_option_group_new("verify",
@ -452,7 +451,7 @@ config_options_group_verify (void)
static GOptionGroup* static GOptionGroup*
config_options_group_server (void) config_options_group_server ()
{ {
GOptionGroup *og; GOptionGroup *og;
GOptionEntry entries[] = { GOptionEntry entries[] = {
@ -654,7 +653,7 @@ Mu::mu_config_show_help (MuConfigCmd cmd)
} }
static gboolean static gboolean
cmd_help (void) cmd_help ()
{ {
MuConfigCmd cmd; MuConfigCmd cmd;