Rename do_unsubscribe into unsubsribe

diff --git a/include/mlmmj.h b/include/mlmmj.h
index 9c4b93eed3919c99e348a1fef3072b0a89ab94f6..5bff1dc5b9f032e4657b1e4bd1999a1d8fa1fe18 100644 (file)
--- a/include/mlmmj.h
+++ b/include/mlmmj.h
@@ -101,7 +101,7 @@ bool parse_lastdigest(char *line, long *lastindex, time_t *lasttime,
     long *lastissue, const char **errstr);
 time_t extract_bouncetime(char *line, const char **errstr);
 int open_subscriber_directory(int listfd, enum subtype typesub, const char **dir);
-bool do_unsubscribe(int listfd, const char *address, enum subtype typesub);
+bool unsubscribe(int listfd, const char *address, enum subtype typesub);
 
 #define MY_ASSERT(expression) if (!(expression)) { \
                        errno = 0; \

diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index 31bd665a438d66190a76a557541cb4ae580a1ad5..544aa9349bc3cb7939065b9d1b3f75aec9ea050d 100644 (file)
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -566,7 +566,7 @@ unsub_bouncers(int dfd, int logfd)
                }
                *a = '@';
 
-               if (!do_unsubscribe(dfd, address, SUB_ALL)) {
+               if (!unsubscribe(dfd, address, SUB_ALL)) {
                        log(" - Some errors during unsubscription of %s\n",
                            address);
                        ret = false;

diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c
index cf5618c2bc7d2ed4914b58579a896102e40455e7..15160276b8ea065080f4a7b8eefb3944c0651bed 100644 (file)
--- a/src/mlmmj-unsub.c
+++ b/src/mlmmj-unsub.c
@@ -441,7 +441,7 @@ int main(int argc, char **argv)
                generate_unsubconfirm(listdir, listaddr, listdelim, address,
                                mlmmjsend, typesub, reasonsub);
 
-       do_unsubscribe(listfd, address, typesub);
+       unsubscribe(listfd, address, typesub);
        close(listfd);
 
        if(confirmunsub) {

diff --git a/src/mlmmj.c b/src/mlmmj.c
index 4c0d55f67fcb45fc24dbfb693f6c7f1bb56ea09c..5e11f10bfa7d3348170cb8c230e3474dacae557c 100644 (file)
--- a/src/mlmmj.c
+++ b/src/mlmmj.c
@@ -136,7 +136,7 @@ open_subscriber_directory(int listfd, enum subtype typesub, const char **subdir)
 }
 
 bool
-do_unsubscribe(int listfd, const char *address, enum subtype typesub)
+unsubscribe(int listfd, const char *address, enum subtype typesub)
 {
        struct dirent *dp;
        DIR *dir;
@@ -149,11 +149,11 @@ do_unsubscribe(int listfd, const char *address, enum subtype typesub)
 
        switch (typesub) {
        case SUB_ALL:
-               if (!do_unsubscribe(listfd, address, SUB_NORMAL))
+               if (!unsubscribe(listfd, address, SUB_NORMAL))
                        ret = false;
-               if (!do_unsubscribe(listfd, address, SUB_DIGEST))
+               if (!unsubscribe(listfd, address, SUB_DIGEST))
                        ret = false;
-               if (!do_unsubscribe(listfd, address, SUB_NOMAIL))
+               if (!unsubscribe(listfd, address, SUB_NOMAIL))
                        ret = false;
                return (ret);
        case SUB_NORMAL:

diff --git a/tests/mlmmj.c b/tests/mlmmj.c
index e17879be7c9a2a8e30d90d2e2fee7e186a16c0e2..67a9ec09f00a55619d3248463a20e8ad21d4d36a 100644 (file)
--- a/tests/mlmmj.c
+++ b/tests/mlmmj.c
@@ -886,7 +886,7 @@ ATF_TC_BODY(unsubscribe, tc)
        fputs("john@doe.org\n", f);
        fclose(f);
 
-       ATF_REQUIRE(do_unsubscribe(listfd, "john@doe.org", SUB_ALL));
+       ATF_REQUIRE(unsubscribe(listfd, "john@doe.org", SUB_ALL));
        ATF_REQUIRE_EQ_MSG(access("list/subscribers.d/j", F_OK), -1, "Not unsubscribed");
        ATF_REQUIRE_EQ_MSG(access("list/digesters.d/j", F_OK), -1, "Not unsubscribed from digest");
        if (!atf_utils_compare_file("list/nomailsubs.d/j", "jane@doe.org\n")) {
@@ -894,28 +894,28 @@ ATF_TC_BODY(unsubscribe, tc)
                atf_tc_fail("Not unsubscribed from nomail");
        }
 
-       ATF_REQUIRE(do_unsubscribe(listfd, "jane@doe.org", SUB_NOMAIL));
+       ATF_REQUIRE(unsubscribe(listfd, "jane@doe.org", SUB_NOMAIL));
        ATF_REQUIRE_EQ_MSG(access("list/nomailsubs.d/j", F_OK), -1, "Not unsubscribed from nomail");
 
-       ATF_REQUIRE(!do_unsubscribe(listfd, "plop@meh", SUB_BOTH));
+       ATF_REQUIRE(!unsubscribe(listfd, "plop@meh", SUB_BOTH));
        rmdir("list/subscribers.d");
-       ATF_REQUIRE(!do_unsubscribe(listfd, "plop@meh", SUB_NORMAL));
+       ATF_REQUIRE(!unsubscribe(listfd, "plop@meh", SUB_NORMAL));
        mkdir("list/subscribers.d", 0755);
 
        f = fopen("list/nomailsubs.d/j", "w");
        fclose(f);
        chmod("list/nomailsubs.d/j", 0111);
-       ATF_REQUIRE(do_unsubscribe(listfd, "plop@meh", SUB_NOMAIL));
+       ATF_REQUIRE(unsubscribe(listfd, "plop@meh", SUB_NOMAIL));
        chmod("list/nomailsubs.d/j", 0644);
-       ATF_REQUIRE(do_unsubscribe(listfd, "plop@meh", SUB_NOMAIL));
+       ATF_REQUIRE(unsubscribe(listfd, "plop@meh", SUB_NOMAIL));
        unlink("list/nomailsubs.d/j");
 
        f = fopen("list/nomailsubs.d/j", "w");
        fputs("john@doe.org\n", f);
        fputs("jane@doe.org\n", f);
        fclose(f);
-       ATF_REQUIRE(do_unsubscribe(listfd, "plop@meh", SUB_NOMAIL));
-       ATF_REQUIRE(!do_unsubscribe(-1, "plop@meh", SUB_ALL));
+       ATF_REQUIRE(unsubscribe(listfd, "plop@meh", SUB_NOMAIL));
+       ATF_REQUIRE(!unsubscribe(-1, "plop@meh", SUB_ALL));
 
 }