mlmmj-maintd: mlmmjunsub is not necessary anymore

diff --git a/include/mlmmj-maintd.h b/include/mlmmj-maintd.h
index ab09ec60a323b7d12191ae069de8f84c57cd54a2..dee3908a03f843648c65cdf5cf12b851fb4f7711 100644 (file)
--- a/include/mlmmj-maintd.h
+++ b/include/mlmmj-maintd.h
@@ -33,7 +33,7 @@ int resend_queue(struct mlmmj_list *list, const char *mlmmjsend);
 int resend_requeue(struct mlmmj_list *list, const char *mlmmjsend);
 int clean_nolongerbouncing(struct mlmmj_list *list);
 int probe_bouncers(struct mlmmj_list *list, const char *mlmmjbounce);
-int unsub_bouncers(struct mlmmj_list *list, const char *mlmmjunsub);
+int unsub_bouncers(struct mlmmj_list *list);
 int run_digests(struct mlmmj_list *list, const char *mlmmjsend);
 
 /* I know the below is nasty, but it requires C99 to have multiple

diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index a2e1109f25325f40c461e77e5a16762384d43036..9c10e776416d2fe5a2155bf9ae5206af063e2018 100644 (file)
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -596,7 +596,7 @@ int probe_bouncers(struct mlmmj_list *list, const char *mlmmjbounce)
        return 0;
 }
 
-int unsub_bouncers(struct mlmmj_list *list, const char *mlmmjunsub)
+int unsub_bouncers(struct mlmmj_list *list)
 {
        DIR *bouncedir;
        char *dirname = concatstr(2, list->dir, "/bounce/");
@@ -819,7 +819,7 @@ int run_digests(struct mlmmj_list *list, const char *mlmmjsend)
 }
 
 void do_maintenance(const char *listdir, const char *mlmmjsend,
-                   const char *mlmmjbounce, const char *mlmmjunsub)
+                   const char *mlmmjbounce)
 {
        char *random, *logname;
        char timenow[64];
@@ -901,8 +901,8 @@ void do_maintenance(const char *listdir, const char *mlmmjsend,
        WRITEMAINTLOG("clean_nolongerbouncing(%s);\n", listdir);
        clean_nolongerbouncing(&list);
 
-       WRITEMAINTLOG("unsub_bouncers(%s, %s);\n", listdir, mlmmjunsub);
-       unsub_bouncers(&list, mlmmjunsub);
+       WRITEMAINTLOG("unsub_bouncers(%s);\n", listdir);
+       unsub_bouncers(&list);
 
        WRITEMAINTLOG("probe_bouncers(%s, %s);\n", listdir, mlmmjbounce);
        probe_bouncers(&list, mlmmjbounce);
@@ -923,7 +923,7 @@ void do_maintenance(const char *listdir, const char *mlmmjsend,
 int main(int argc, char **argv)
 {
        int opt, daemonize = 1, ret = 0;
-       char *bindir, *listdir = NULL, *mlmmjsend, *mlmmjbounce, *mlmmjunsub;
+       char *bindir, *listdir = NULL, *mlmmjsend, *mlmmjbounce;
        char *dirlists = NULL, *listiter;
        struct dirent *dp;
        DIR *dirp;
@@ -967,7 +967,6 @@ int main(int argc, char **argv)
        bindir = mydirname(argv[0]);
        myasprintf(&mlmmjsend, "%s/mlmmj-send", bindir);
        myasprintf(&mlmmjbounce, "%s/mlmmj-bounce", bindir);
-       myasprintf(&mlmmjunsub, "%s/mlmmj-unsub", bindir);
        myfree(bindir);
 
        if(daemonize) {
@@ -985,8 +984,7 @@ int main(int argc, char **argv)
 
        while(1) {
                if(listdir) {
-                       do_maintenance(listdir, mlmmjsend, mlmmjbounce,
-                                       mlmmjunsub);
+                       do_maintenance(listdir, mlmmjsend, mlmmjbounce);
                        goto mainsleep;
                }
 
@@ -995,7 +993,6 @@ int main(int argc, char **argv)
                                        dirlists);
                        myfree(mlmmjbounce);
                        myfree(mlmmjsend);
-                       myfree(mlmmjunsub);
                        exit(EXIT_FAILURE);
                }
 
@@ -1004,7 +1001,6 @@ int main(int argc, char **argv)
                                        dirlists);
                        myfree(mlmmjbounce);
                        myfree(mlmmjsend);
-                       myfree(mlmmjunsub);
                        exit(EXIT_FAILURE);
                }
 
@@ -1013,8 +1009,7 @@ int main(int argc, char **argv)
                                        (strcmp(dp->d_name, ".") == 0))
                                continue;
                        myasprintf(&listiter, "%s/%s", dirlists, dp->d_name);
-                       do_maintenance(listiter, mlmmjsend, mlmmjbounce,
-                                       mlmmjunsub);
+                       do_maintenance(listiter, mlmmjsend, mlmmjbounce);
                        myfree(listiter);
                }
 
@@ -1029,8 +1024,6 @@ mainsleep:
 
        myfree(mlmmjbounce);
        myfree(mlmmjsend);
-       myfree(mlmmjunsub);
-
        log_free_name();
                
        exit(EXIT_SUCCESS);