Commit 4201cfce authored by @wuzhangjin's avatar @wuzhangjin Committed by Willy Tarreau
Browse files

tools/nolibc: clean up sbrk() routine 



Fix up the error reported by scripts/checkpatch.pl:

    ERROR: do not use assignment in if condition
    #95: FILE: tools/include/nolibc/sys.h:95:
    +	if ((ret = sys_brk(0)) && (sys_brk(ret + inc) == ret + inc))

Apply the new generic __sysret() to merge the SET_ERRNO() and return
lines.

Signed-off-by: default avatarZhangjin Wu <falcon@tinylab.org>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 924e9539

tools/include/nolibc/sys.h

+4 −5
Original line number Diff line number Diff line
@@ -89,14 +89,13 @@ int brk(void *addr) 
static __attribute__((unused))

void *sbrk(intptr_t inc)

{

	void *ret;



	/* first call to find current end */

	if ((ret = sys_brk(0)) && (sys_brk(ret + inc) == ret + inc))

	void *ret = sys_brk(0);



	if (ret && sys_brk(ret + inc) == ret + inc)

		return ret + inc;



	SET_ERRNO(ENOMEM);

	return (void *)-1;

	return (void *)__sysret(-ENOMEM);

}