From 86e6d7daaa1ed9bcd81326be91caa0d206daa4e5 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Mon, 22 Oct 2018 02:24:40 +0300
Subject: Split for_each_line_in_file and make more generic

---
 src/cli/proc-region-rw.c |  2 +-
 src/util.h               | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/cli/proc-region-rw.c b/src/cli/proc-region-rw.c
index 360f7ac..282fa09 100644
--- a/src/cli/proc-region-rw.c
+++ b/src/cli/proc-region-rw.c
@@ -153,7 +153,7 @@ proc_region_rw(int argc, const char *argv[], bool (*mem_io_init)(struct mem_io*,
    if (!mem_io_init(&ctx.io, pid))
        return EXIT_FAILURE;
 
-   for_each_line_in_file(ctx.regions, region_cb, &ctx);
+   for_each_token_in_file(ctx.regions, '\n', region_cb, &ctx);
    const size_t trw = ctx.trw;
 
    mem_io_release(&ctx.io);
diff --git a/src/util.h b/src/util.h
index 1c345e8..0479680 100644
--- a/src/util.h
+++ b/src/util.h
@@ -29,8 +29,21 @@ region_parse(struct region *region, const char *line)
    return true;
 }
 
+static inline size_t
+for_each_token_in_str(const char *str, const char token, void (*cb)(const char *line, void *data), void *data)
+{
+   size_t ate = 0;
+   for (char *line = (char*)str, *nl; (nl = strchr(line, token)); line = nl + 1) {
+      *nl = 0;
+      cb(line, data);
+      *nl = token;
+      ate += nl + 1 - line;
+   }
+   return ate;
+}
+
 static inline void
-for_each_line_in_file(FILE *f, void (*cb)(const char *line, void *data), void *data)
+for_each_token_in_file(FILE *f, const char token, void (*cb)(const char *line, void *data), void *data)
 {
    char *buffer = NULL;
    const size_t step = 1024;
@@ -40,14 +53,7 @@ for_each_line_in_file(FILE *f, void (*cb)(const char *line, void *data), void *d
          err(EXIT_FAILURE, "realloc");
 
       buffer[(written += read)] = 0;
-
-      size_t ate = 0;
-      for (char *line = buffer, *nl; (nl = strchr(line, '\n')); line = nl + 1) {
-         *nl = 0;
-         cb(line, data);
-         ate += nl + 1 - line;
-      }
-
+      const size_t ate = for_each_token_in_str(buffer, token, cb, data);
       memmove(buffer, buffer + ate, (written = written - ate));
    } while ((read = fread(buffer + written, 1, allocated - written, f)));
 
-- 
cgit v1.2.3