more use helpers

diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index a101746aff53a33694ad916e2893bec7b474fa39..ad11c27514681d382bb3c973200df3eb41ac478c 100644 (file)
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -791,7 +791,6 @@ int unsub_bouncers(struct mlmmj_list *list, const char *mlmmjunsub)
 int run_digests(struct mlmmj_list *list, const char *mlmmjsend)
 {
        char *lasttimestr, *lastindexstr, *lastissuestr;
-       char *digestmaxmailsstr;
        char *s1, *s2;
        time_t digestinterval, t, lasttime;
        long digestmaxmails, lastindex, index, lastissue;
@@ -805,13 +804,9 @@ int run_digests(struct mlmmj_list *list, const char *mlmmjsend)
        if (digestinterval == 0)
                digestinterval = (time_t)DIGESTINTERVAL;
 
-       digestmaxmailsstr = ctrlvalue(list, "digestmaxmails");
-       if (digestmaxmailsstr) {
-               digestmaxmails = atol(digestmaxmailsstr);
-               myfree(digestmaxmailsstr);
-       } else {
+       digestmaxmails = ctrllong(list, "digestmaxmails");
+       if (digestmaxmails == 0)
                digestmaxmails = DIGESTMAXMAILS;
-       }
 
        fd = openat(list->fd, "latestdigest", O_RDWR | O_CREAT | O_EXLOCK, S_IRUSR | S_IWUSR);
        if (fd < 0) {

diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index 31bbbd303e4581a0964f4a1d9d6e67edb918d079..d2d7cd06b486fa9bb43d5c819134a2f7a5d1b3e7 100644 (file)
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -801,9 +801,9 @@ int main(int argc, char **argv)
        char *relayhost = NULL, *archivefilename = NULL, *tmpstr;
        char *listctrl = NULL, *subddirname = NULL;
        char *mlmmjbounce = NULL, *bindir, *mailmap, *probefile, *a;
-       char *body = NULL, *hdrs = NULL, *memmailsizestr = NULL, *verp = NULL;
-       char relay[16], *verpfrom, *maxverprecipsstr;
-       char strindex[32], *reply, *strport, *smtphelo, *requeuefilename;
+       char *body = NULL, *hdrs = NULL, *verp = NULL;
+       char relay[16], *verpfrom;
+       char strindex[32], *reply, *smtphelo, *requeuefilename;
        ssize_t memmailsize = 0;
        DIR *subddir;
        struct dirent *dp;
@@ -814,7 +814,6 @@ int main(int argc, char **argv)
        struct mlmmj_list list;
        unsigned short smtpport = 25;
        struct sigaction sigact;
-       const char *errstr;
 
        mlmmj_list_init(&list);
        CHECKFULLPATH(argv[0]);
@@ -926,12 +925,7 @@ int main(int argc, char **argv)
                if(statctrl(&list, "verp") == 1)
                        verp = mystrdup("");
 
-       maxverprecipsstr = ctrlvalue(&list, "maxverprecips");
-       if(verp && maxverprecipsstr) {
-               maxverprecips = atol(maxverprecipsstr);
-               myfree(maxverprecipsstr);
-       }
-
+       maxverprecips = ctrlint(&list, "maxverprecips");
        if(maxverprecips <= 0)
                maxverprecips = MAXVERPRECIPS;
 
@@ -969,14 +963,9 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       memmailsizestr = ctrlvalue(&list, "memorymailsize");
+       memmailsize = ctrlsizet(&list, "memorymailsize");
        ctrlarchive = statctrl(&list, "noarchive");
-       if(memmailsizestr) {
-               memmailsize = strtoim(memmailsizestr, 0, SIZE_T_MAX, &errstr);
-               myfree(memmailsizestr);
-       }
-
-       if(memmailsize == 0)
+       if (memmailsize == 0)
                memmailsize = MEMORYMAILSIZE;
 
        if(st.st_size > memmailsize) {
@@ -1075,9 +1064,8 @@ int main(int argc, char **argv)
                                strncpy(relay, RELAYHOST, sizeof(relay));
                }
        }
-       strport = ctrlvalue(&list, "smtpport");
-       if(strport)
-               smtpport = (unsigned short)atol(strport);
+       if (statctrl(&list, "smtpport"))
+               smtpport = (unsigned short)ctrlint(&list, "smtpport");
 
        if ((smtphelo = ctrlvalue(&list, "smtphelo")) == NULL) {
                smtphelo = hostnamestr();