From: mmj <none@none>
Date: Thu, 22 Apr 2004 21:25:12 +0000 (+1000)
Subject: mlmmj-{,un}subscribe uses mygetline(int fd); now
X-Git-Tag: RELEASE_1_0_0~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b7a57a4f7c882a319bb17249fb91e09302e0450;p=thirdparty%2Fmlmmj.git

mlmmj-{,un}subscribe uses mygetline(int fd); now
---

diff --git a/src/mlmmj-unsubscribe.c b/src/mlmmj-unsubscribe.c
index c1ce0238..46753f4e 100644
--- a/src/mlmmj-unsubscribe.c
+++ b/src/mlmmj-unsubscribe.c
@@ -234,17 +234,11 @@ void generate_unsubconfirm(const char *listdir, const char *listaddr,
 void unsubscribe(int subreadfd, int subwritefd, const char *address)
 {
 	char *buf;
-	FILE *subfile;
 
 	lseek(subreadfd, 0, SEEK_SET);
 	lseek(subwritefd, 0, SEEK_SET);
 
-	if((subfile = fdopen(subreadfd, "r")) == NULL) {
-		log_error("could not fdopen subfilefd");
-		exit(EXIT_FAILURE);
-	}
-
-	while((buf = myfgetline(subfile))) {
+	while((buf = mygetline(subreadfd))) {
 		if(strncasecmp(buf, address, strlen(address)) != 0)
 			writen(subwritefd, buf, strlen(buf));
 		free(buf);
diff --git a/src/subscriberfuncs.c b/src/subscriberfuncs.c
index 75c92623..9c436394 100644
--- a/src/subscriberfuncs.c
+++ b/src/subscriberfuncs.c
@@ -19,14 +19,8 @@
 int find_subscriber(int subfilefd, const char *address)
 {
 	char *buf;
-	FILE *subfile;
 
-	if((subfile = fdopen(subfilefd, "r")) == NULL) {
-		log_error("could not fdopen subfilefd");
-		exit(EXIT_FAILURE);
-	}
-	
-	while ((buf = myfgetline(subfile))) {
+	while ((buf = mygetline(subfilefd))) {
 		while (buf[0] && isspace(buf[strlen(buf)-1]))
 			buf[strlen(buf)-1] = '\0';
 		if (strcasecmp(buf, address) == 0) {