summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenys Vlasenko2011-06-17 03:37:43 +0200
committerDenys Vlasenko2011-06-17 03:37:43 +0200
commita1a448347e71c9899ad1500cbd8739fd82e1bb91 (patch)
treeb6f60da8a298eb37b672b68245e664dc04951d7f /include
parent901a53baecd5b8a580f63eb23d481f553de72634 (diff)
downloadbusybox-a1a448347e71c9899ad1500cbd8739fd82e1bb91.zip
busybox-a1a448347e71c9899ad1500cbd8739fd82e1bb91.tar.gz
libbb: split bb_get_chunk_from_file and bb_get_chunk_with_continuation
This also moves bb_get_chunk_with_continuation into its sole user, parse_config.c. This allows to optimize both functions separately, they need to be optimized for speed. (this need was highlighted by slow modprobe caused in part by slow bb_get_chunk_with_continuation in config parser). function old new delta bb_get_chunk_from_file 7 130 +123 config_read 457 558 +101 bb_get_chunk_with_continuation 194 - -194 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 2/0 up/down: 224/-194) Total: 30 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2d46061..5d2b4c8 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -730,8 +730,12 @@ extern void xclose(int fd) FAST_FUNC;
/* Reads and prints to stdout till eof, then closes FILE. Exits on error: */
extern void xprint_and_close_file(FILE *file) FAST_FUNC;
+/* Reads a line from a text file, up to a newline or NUL byte, inclusive.
+ * Returns malloc'ed char*. If end is NULL '\n' isn't considered
+ * end of line. If end isn't NULL, length of the chunk is stored in it.
+ * Returns NULL if EOF/error.
+ */
extern char *bb_get_chunk_from_file(FILE *file, int *end) FAST_FUNC;
-extern char *bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno) FAST_FUNC;
/* Reads up to (and including) TERMINATING_STRING: */
extern char *xmalloc_fgets_str(FILE *file, const char *terminating_string) FAST_FUNC RETURNS_MALLOC;
/* Same, with limited max size, and returns the length (excluding NUL): */