unsubscribe: remove unused parameter

diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index 3a8dfe1dfd5b76b9b5a7263d545975a1b5d889bf..9a0ea740a8a62b791e00d26552b3b73ba6a37869 100644 (file)
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -33,6 +33,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 
+#include "xmalloc.h"
 #include "mlmmj-maintd.h"
 #include "mlmmj.h"
 #include "strgen.h"
@@ -40,7 +41,6 @@
 #include "log_error.h"
 #include "mygetline.h"
 #include "wrappers.h"
-#include "xmalloc.h"
 #include "controls.h"
 #include "send_digest.h"
 #include "log_oper.h"
@@ -694,7 +694,7 @@ int unsub_bouncers(struct mlmmj_list *list)
                }
                *a = '@';
 
-               unsubscribe(list, address, SUB_ALL, SUB_BOUNCING);
+               unsubscribe(list, address, SUB_ALL);
                log_oper(list->dir, OPLOGFNAME, "mlmmj-maintd: %s"
                        " unsubscribed due to bouncing since"
                        " %s", address, bouncedata);

diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index dcaf6276c682fac45f5a853177a990e67b7f27a9..077e00a424bcedca42c456729b24f2d8cfc47e31 100644 (file)
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -36,6 +36,7 @@
 #include <sys/wait.h>
 #include <ctype.h>
 
+#include "xmalloc.h"
 #include "mlmmj.h"
 #include "mlmmj-sub.h"
 #include "wrappers.h"
@@ -45,7 +46,6 @@
 #include "mygetline.h"
 #include "controls.h"
 #include "prepstdreply.h"
-#include "xmalloc.h"
 #include "chomp.h"
 #include "send_mails.h"
 
@@ -710,7 +710,7 @@ int main(int argc, char **argv)
                 * missing version, so don't unsub. */
                if (!(typesub == SUB_BOTH &&
                                subbed != SUB_NOMAIL)) {
-                       unsubscribe(&list, address, subbed == SUB_BOTH ? typesub : SUB_ALL, SUB_ADMIN);
+                       unsubscribe(&list, address, subbed == SUB_BOTH ? typesub : SUB_ALL);
                }
        }
 

diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c
index e3792373467ddc6e1bfd823c60079daf94409f7f..e3584d576d94d90c558ac99eab5c3378b70fffad 100644 (file)
--- a/src/mlmmj-unsub.c
+++ b/src/mlmmj-unsub.c
@@ -30,12 +30,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include "xmalloc.h"
 #include "mlmmj.h"
 #include "mlmmj-unsub.h"
 #include "subscriberfuncs.h"
 #include "strgen.h"
 #include "log_error.h"
-#include "xmalloc.h"
 #include "controls.h"
 #include "prepstdreply.h"
 #include "send_mails.h"
@@ -388,11 +388,11 @@ int main(int argc, char **argv)
                generate_unsubconfirm(&list, address, typesub, reasonsub);
 
        if (typesub == SUB_ALL) {
-               unsubscribe(&list, address, SUB_NORMAL, reasonsub);
-               unsubscribe(&list, address, SUB_DIGEST, reasonsub);
-               unsubscribe(&list, address, SUB_NOMAIL, reasonsub);
+               unsubscribe(&list, address, SUB_NORMAL);
+               unsubscribe(&list, address, SUB_DIGEST);
+               unsubscribe(&list, address, SUB_NOMAIL);
        } else {
-               unsubscribe(&list, address, typesub, reasonsub);
+               unsubscribe(&list, address, typesub);
        }
 
        if(confirmunsub) {

diff --git a/src/subscriberfuncs.c b/src/subscriberfuncs.c
index 281fe93c45c680d0be6f084228adc81e977aa6f5..07fffaea1cf3ae502ddcc753272e53fb3b3165a6 100644 (file)
--- a/src/subscriberfuncs.c
+++ b/src/subscriberfuncs.c
@@ -33,13 +33,13 @@
 #include <dirent.h>
 #include <fcntl.h>
 
+#include "xmalloc.h"
 #include "mlmmj.h"
 #include "subscriberfuncs.h"
 #include "mygetline.h"
 #include "log_error.h"
 #include "wrappers.h"
 #include "strgen.h"
-#include "xmalloc.h"
 
 char *subtype_strs[] = {
        "normal",
@@ -279,8 +279,7 @@ real_unsubscribe(int subreadfd, int subwritefd, const char *address)
        return written;
 }
 void
-unsubscribe(struct mlmmj_list *list, const char *address, enum subtype typesub,
-    enum subreason reasonsub)
+unsubscribe(struct mlmmj_list *list, const char *address, enum subtype typesub)
 {
        const char *subdir;
        char *sublockname;