diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-21 21:03:51 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-21 21:03:51 +0200 |
| commit | f56fb5eb1120a92bdfb6d0ce64b3430b42a2efa0 (patch) | |
| tree | 6e013fd342ece68ad902b849155625a160582967 | |
| parent | df70a43af281f7e653b1c95ff17201669fdcfca3 (diff) | |
| download | busybox-f56fb5eb1120a92bdfb6d0ce64b3430b42a2efa0.tar.gz | |
libbb: make "COMMON_BUFSIZE = 1024 bytes, the buffer will be malloced" work
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/common_bufsiz.c | 6 | ||||
| -rwxr-xr-x | scripts/generate_BUFSIZ.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libbb/common_bufsiz.c b/libbb/common_bufsiz.c index c16c361c9..26faafcbb 100644 --- a/libbb/common_bufsiz.c +++ b/libbb/common_bufsiz.c @@ -55,14 +55,14 @@ char bb_common_bufsiz1[COMMON_BUFSIZE] ALIGNED(sizeof(long long)); # ifndef setup_common_bufsiz /* - * It is not a "((void)0)" macro. It means we have to provide this function. + * It is not defined as a dummy macro. + * It means we have to provide this function. */ char* bb_common_bufsiz1; -char* setup_common_bufsiz(void) +void setup_common_bufsiz(void) { if (!bb_common_bufsiz1) bb_common_bufsiz1 = xzalloc(COMMON_BUFSIZE); - return bb_common_bufsiz1; } # else # ifndef bb_common_bufsiz1 diff --git a/scripts/generate_BUFSIZ.sh b/scripts/generate_BUFSIZ.sh index bb0738641..d54142597 100755 --- a/scripts/generate_BUFSIZ.sh +++ b/scripts/generate_BUFSIZ.sh @@ -87,7 +87,8 @@ if test $REM -lt 1024; then echo "Rerun make to build a binary which doesn't use it!" exit 1 fi - exit 0 + echo "COMMON_BUFSIZE = 1024 bytes, the buffer will be malloced" + exit 0 fi # _end[] has REM bytes for bb_common_bufsiz1[] @@ -102,7 +103,7 @@ echo "#define setup_common_bufsiz() ((void)0)" } | regenerate "$common_bufsiz_h" echo $REM >"$common_bufsiz_h.BUFSIZE" -# Check that code did not grow too much and thus _end[] did not shink: +# Check that code did not grow too much and thus _end[] did not shrink: if test $OLD -gt $REM; then echo "Warning! Space in _end[] has decreased from $OLD to $REM bytes!" echo "Rerun make!" |