# HG changeset patch # User mmj # Date 1082669112 -36000 # Node ID b7b8efd520ec69f6929a71ea49b6ce78c2e2aaf8 # Parent 91830455b49c43e454e7b7d63cdb461308af5b31 mlmmj-{,un}subscribe uses mygetline(int fd); now diff -r 91830455b49c -r b7b8efd520ec src/mlmmj-unsubscribe.c --- a/src/mlmmj-unsubscribe.c Fri Apr 23 07:14:22 2004 +1000 +++ b/src/mlmmj-unsubscribe.c Fri Apr 23 07:25:12 2004 +1000 @@ -234,17 +234,11 @@ 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 -r 91830455b49c -r b7b8efd520ec src/subscriberfuncs.c --- a/src/subscriberfuncs.c Fri Apr 23 07:14:22 2004 +1000 +++ b/src/subscriberfuncs.c Fri Apr 23 07:25:12 2004 +1000 @@ -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) {