From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 2 Sep 2018 16:35:29 +0000 (+0200)
Subject: Revert "libbb: remove unnecessary variable in xmalloc_fgets"
X-Git-Tag: 1_30_0~454
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d598ab9f03dbf320f7b81c05e4a94cb303dfbc7;p=oweals%2Fbusybox.git

Revert "libbb: remove unnecessary variable in xmalloc_fgets"

The variable is in fact necessary.

    commit 2da9724b56169f00bd7fb6b9a11c9409a7620981
    Author: Quentin Rameau <quinq@fifth.space>
    Date:   Sun Apr 1 17:05:35 2018 +0200
        libbb: remove unnecessary variable in xmalloc_fgets

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index f3d6c6203..49ef093c2 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -47,7 +47,9 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
 /* Get line, including trailing \n if any */
 char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
-	return bb_get_chunk_from_file(file, NULL);
+	int i;
+
+	return bb_get_chunk_from_file(file, &i);
 }
 /* Get line.  Remove trailing \n */
 char* FAST_FUNC xmalloc_fgetline(FILE *file)