*: introduce and use FAST_FUNC: regparm on i386, otherwise no-on

[oweals/busybox.git] / libbb / get_line_from_file.c

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 2c9608e9edc2f00f2e3c12a1c5d525c7d736a770..66ea5a1a5d99d5bde517090d9cc838bdee82869f 100644 (file)
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -12,12 +12,11 @@
 #include "libbb.h"
 
 /* This function reads an entire line from a text file, up to a newline
- * or NUL byte, inclusive.  It returns a malloc'ed char * which must be
- * stored and free'ed by the caller.  If end is NULL '\n' isn't considered
+ * or NUL byte, inclusive.  It returns a malloc'ed char * which
+ * must be free'ed by the caller.  If end is NULL '\n' isn't considered
  * end of line.  If end isn't NULL, length of the chunk read is stored in it.
  * Return NULL if EOF/error */
-
-char *bb_get_chunk_from_file(FILE * file, int *end)
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 {
        int ch;
        int idx = 0;
@@ -27,7 +26,8 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
        while ((ch = getc(file)) != EOF) {
                /* grow the line buffer as necessary */
                if (idx >= linebufsz) {
-                       linebuf = xrealloc(linebuf, linebufsz += 80);
+                       linebufsz += 80;
+                       linebuf = xrealloc(linebuf, linebufsz);
                }
                linebuf[idx++] = (char) ch;
                if (!ch || (end && ch == '\n'))
@@ -49,7 +49,7 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
 }
 
 /* Get line, including trailing \n if any */
-char *xmalloc_fgets(FILE * file)
+char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
        int i;
 
@@ -57,7 +57,7 @@ char *xmalloc_fgets(FILE * file)
 }
 
 /* Get line.  Remove trailing \n */
-char *xmalloc_getline(FILE * file)
+char* FAST_FUNC xmalloc_fgetline(FILE *file)
 {
        int i;
        char *c = bb_get_chunk_from_file(file, &i);