diff options
author | javiplx@gmail.com <javiplx@gmail.com@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2011-04-26 09:45:15 (EDT) |
---|---|---|
committer | javiplx@gmail.com <javiplx@gmail.com@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2011-04-26 09:45:15 (EDT) |
commit | bcf06b0c94483291a280c82242ecbd634cb3a921 (patch) | |
tree | 14c8cf90ef5fc5990743ea29a9ba1c8a90bb6de9 /libopkg/parse_util.c | |
parent | 408a9ff806c905990d41194b57368e2a751b60fc (diff) |
Introduce a specific pointer typedef for parse_line functions
git-svn-id: http://opkg.googlecode.com/svn/trunk@620 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/parse_util.c')
-rw-r--r-- | libopkg/parse_util.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libopkg/parse_util.c b/libopkg/parse_util.c index 538bb11..54850a8 100644 --- a/libopkg/parse_util.c +++ b/libopkg/parse_util.c @@ -22,7 +22,6 @@ #include "libbb/libbb.h" #include "parse_util.h" -#include "pkg_parse.h" int is_field(const char *type, const char *line) @@ -89,7 +88,7 @@ parse_list(const char *raw, unsigned int *count, const char sep, int skip_field) } int -parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask, +parse_from_stream_nomalloc(parse_line_t parse_line, void *ptr, FILE *fp, uint mask, char **buf0, size_t buf0len) { int ret, lineno; @@ -111,7 +110,7 @@ parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask, } else if (strlen(*buf0) == buf0len-1) { opkg_msg(ERROR, "Missing new line character" " at end of file!\n"); - pkg_parse_line(pkg, *buf0, mask); + parse_line(ptr, *buf0, mask); } break; } @@ -126,7 +125,7 @@ parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask, */ opkg_msg(ERROR, "Missing new line character" " at end of file!\n"); - pkg_parse_line(pkg, *buf0, mask); + parse_line(ptr, *buf0, mask); break; } if (buf0len >= EXCESSIVE_LINE_LEN) { @@ -157,7 +156,7 @@ parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask, lineno++; - if (pkg_parse_line(pkg, *buf0, mask)) + if (parse_line(ptr, *buf0, mask)) break; buf = *buf0; |