masqmail
changeset 254:82d168dd52fd
removed the obsolete pos argument from time_interval()
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Thu, 04 Nov 2010 14:45:42 -0300 |
| parents | c28e8dfebfc3 |
| children | 2e7d3a02edb1 |
| files | src/conf.c src/fail_msg.c src/masqmail.c src/masqmail.h src/timeival.c |
| diffstat | 5 files changed, 5 insertions(+), 10 deletions(-) [+] |
line diff
1.1 --- a/src/conf.c Thu Nov 04 14:36:47 2010 -0300 1.2 +++ b/src/conf.c Thu Nov 04 14:45:42 2010 -0300 1.3 @@ -557,8 +557,7 @@ 1.4 else if (strcmp(lval, "warn_intervals") == 0) 1.5 conf.warn_intervals = parse_list(rval, FALSE); 1.6 else if (strcmp(lval, "max_defer_time") == 0) { 1.7 - gint dummy; 1.8 - gint ival = time_interval(rval, &dummy); 1.9 + gint ival = time_interval(rval); 1.10 if (ival < 0) 1.11 logwrite(LOG_WARNING, "invalid time interval for 'max_defer_time': %s\n", rval); 1.12 else
2.1 --- a/src/fail_msg.c Thu Nov 04 14:36:47 2010 -0300 2.2 +++ b/src/fail_msg.c Thu Nov 04 14:45:42 2010 -0300 2.3 @@ -133,12 +133,11 @@ 2.4 warn_msg_is_due(message * msg) 2.5 { 2.6 time_t now = time(NULL); 2.7 - gint dummy; 2.8 2.9 GList *node; 2.10 for (node = g_list_last(conf.warn_intervals); node; node = g_list_previous(node)) { 2.11 gchar *str_ival = (gchar *) (node->data); 2.12 - gint ival = time_interval(str_ival, &dummy); 2.13 + gint ival = time_interval(str_ival); 2.14 if (ival >= 0) { 2.15 DEBUG(5) debugf("ival = %d\n", ival); 2.16 DEBUG(5) debugf("now - msg->received_time = %d\n", now - msg->received_time);
3.1 --- a/src/masqmail.c Thu Nov 04 14:36:47 2010 -0300 3.2 +++ b/src/masqmail.c Thu Nov 04 14:45:42 2010 -0300 3.3 @@ -522,7 +522,6 @@ 3.4 } else if (strncmp(opt, "q", 1) == 0) { 3.5 /* must be after the `qo' check */ 3.6 gchar *optarg; 3.7 - int dummy; 3.8 3.9 do_runq = TRUE; 3.10 mta_mode = MODE_RUNQUEUE; 3.11 @@ -530,7 +529,7 @@ 3.12 if (optarg) { 3.13 /* not just one single queue run but regular runs */ 3.14 mta_mode = MODE_DAEMON; 3.15 - queue_interval = time_interval(optarg, &dummy); 3.16 + queue_interval = time_interval(optarg); 3.17 } 3.18 3.19 } else if (strcmp(opt, "t") == 0) {
4.1 --- a/src/masqmail.h Thu Nov 04 14:36:47 2010 -0300 4.2 +++ b/src/masqmail.h Thu Nov 04 14:45:42 2010 -0300 4.3 @@ -515,7 +515,7 @@ 4.4 void destroy_table(GList * table); 4.5 4.6 /* timeival.c */ 4.7 -gint time_interval(gchar * str, gint * pos); 4.8 +gint time_interval(gchar * str); 4.9 4.10 /* permissions.c */ 4.11 gboolean is_privileged_user(uid_t uid);
5.1 --- a/src/timeival.c Thu Nov 04 14:36:47 2010 -0300 5.2 +++ b/src/timeival.c Thu Nov 04 14:45:42 2010 -0300 5.3 @@ -22,7 +22,7 @@ 5.4 #include "masqmail.h" 5.5 5.6 gint 5.7 -time_interval(gchar * str, gint * pos) 5.8 +time_interval(gchar * str) 5.9 { 5.10 gchar buf[16]; 5.11 gchar *p = str, *q = buf; 5.12 @@ -30,9 +30,7 @@ 5.13 5.14 while (*p && isdigit(*p) && (q < buf + 15)) { 5.15 *(q++) = *(p++); 5.16 - (*pos)++; 5.17 } 5.18 - (*pos)++; 5.19 *q = '\0'; 5.20 val = atoi(buf); 5.21