init_file_lines: remove unused function

Actually merge into init_truncated_file_lines and rename it

diff --git a/include/prepstdreply.h b/include/prepstdreply.h
index 7f2f6310af868e9ec08645b2af5bb08c47fcfa74..5bda915dc83e819254527fa12eee4e6deda898e9 100644 (file)
--- a/include/prepstdreply.h
+++ b/include/prepstdreply.h
@@ -45,8 +45,7 @@ void rewind_memory_lines(void *state);
 const char *get_memory_line(void *state);
 void finish_memory_lines(memory_lines_state *s);
 
-file_lines_state *init_file_lines(const char *filename);
-file_lines_state *init_truncated_file_lines(const char *filename, char truncate);
+file_lines_state *init_file_lines(const char *filename, char truncate);
 void rewind_file_lines(void *state);
 const char *get_file_line(void *state);
 void finish_file_lines(file_lines_state *s);

diff --git a/src/mlmmj-bounce.c b/src/mlmmj-bounce.c
index 188c6eaac0fe38a31d20195ef873fdf886aae85f..217dcb3fe0fc63b077f976b65f4c3017705a078c 100644 (file)
--- a/src/mlmmj-bounce.c
+++ b/src/mlmmj-bounce.c
@@ -91,7 +91,7 @@ void do_probe(const char *listdir, const char *mlmmjsend, const char *addr,
        MY_ASSERT(txt);
        register_default_unformatted(txt, listdelim, listaddr);
        register_unformatted(txt, "bouncenumbers", "%bouncenumbers%"); /* DEPRECATED */
-       fls = init_truncated_file_lines(addr, ':');
+       fls = init_file_lines(addr, ':');
        register_formatted(txt, "bouncenumbers",
                        rewind_file_lines, get_file_line, fls);
        queuefilename = prepstdreply(txt, listdir, "$listowner$", myaddr, NULL, listfd, ctrlfd);

diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index 8f8cc07f2d48cceeb2931d72ae57f09b3d5deee5..2dc08332dd62f93242faa3148755e55698fc0408 100644 (file)
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -189,24 +189,11 @@ finish_memory_lines(memory_lines_state *s)
 }
 
 
-file_lines_state *init_file_lines(const char *filename)
+file_lines_state *init_file_lines(const char *filename, char truncate)
 {
-       file_lines_state *s = xmalloc(sizeof(file_lines_state));
-
+       file_lines_state *s = xcalloc(1, sizeof(file_lines_state));
        s->filename = xstrdup(filename);
        s->fd = -1;
-
-       s->truncate = '\0';
-       s->line = NULL;
-       return s;
-}
-
-
-file_lines_state *init_truncated_file_lines(const char *filename, char truncate)
-{
-       file_lines_state *s;
-       s = init_file_lines(filename);
-       if (s == NULL) return NULL;
        s->truncate = truncate;
        return s;
 }
@@ -230,7 +217,6 @@ void rewind_file_lines(void *state)
        }
 }
 
-
 const char *get_file_line(void *state)
 {
        file_lines_state *s = (file_lines_state *)state;