From 834a65d85c982506518b55608b9b440d6fbcb3da Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 5 Jul 2014 23:02:30 +0200 Subject: [PATCH] make store/account error messages less redundant this will become more relevant when more are added. --- src/drv_imap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/drv_imap.c b/src/drv_imap.c index ebd8bf0..b796f45 100644 --- a/src/drv_imap.c +++ b/src/drv_imap.c @@ -2229,6 +2229,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep ) { imap_store_conf_t *store; imap_server_conf_t *server, *srv, sserver; + const char *type, *name; int acc_opt = 0; if (!strcasecmp( "IMAPAccount", cfg->cmd )) { @@ -2344,20 +2345,18 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep ) } acc_opt = 1; } + if (store) + type = "IMAP store", name = store->gen.name; + else + type = "IMAP account", name = server->name; if (!store || !store->server) { if (!server->sconf.tunnel && !server->sconf.host) { - if (store) - error( "IMAP store '%s' has incomplete/missing connection details\n", store->gen.name ); - else - error( "IMAP account '%s' has incomplete/missing connection details\n", server->name ); + error( "%s '%s' has incomplete/missing connection details\n", type, name ); cfg->err = 1; return 1; } if (server->pass && server->pass_cmd) { - if (store) - error( "IMAP store '%s' has both Pass and PassCmd\n", store->gen.name ); - else - error( "IMAP account '%s' has both Pass and PassCmd\n", server->name ); + error( "%s '%s' has both Pass and PassCmd\n", type, name ); cfg->err = 1; return 1; } @@ -2368,7 +2367,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep ) memcpy( store->server, &sserver, sizeof(sserver) ); store->server->name = store->gen.name; } else if (acc_opt) { - error( "IMAP store '%s' has both Account and account-specific options\n", store->gen.name ); + error( "%s '%s' has both Account and account-specific options\n", type, name ); cfg->err = 1; } }