f56fb5eb1
Denys Vlasenko
2016-04-21
Subject
libbb: make "COMMON_BUFSIZE = 1024 bytes, the buffer will be malloced" work
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/common_bufsiz.c+3 -3
| @@ -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 | |
scripts/generate_BUFSIZ.sh+3 -2
| @@ -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!" | |