From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Oct 2022 14:40:59 +0000 (+0200)
Subject: Rename do_unsubscribe into unsubsribe
X-Git-Tag: RELEASE_1_4_0a1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b90ddd613a3e1e303e5f7099e57578d284d6eff4;p=thirdparty%2Fmlmmj.git

Rename do_unsubscribe into unsubsribe
---

diff --git a/include/mlmmj.h b/include/mlmmj.h
index 9c4b93ee..5bff1dc5 100644
--- 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 31bd665a..544aa934 100644
--- 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 cf5618c2..15160276 100644
--- 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 4c0d55f6..5e11f10b 100644
--- 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 e17879be..67a9ec09 100644
--- 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));
 
 }