Commit 2d848295 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

tools/nolibc: avoid using plain integer as NULL pointer 



While an integer zero is a valid NULL pointer as per the C standard,
sparse will complain about it.

Use explicit NULL pointers instead.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202509261452.g5peaXCc-lkp@intel.com/


Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
parent 107eb833

tools/include/nolibc/getopt.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int getopt(int argc, char * const argv[], const char *optstring) 
		return '?';

	}

	if (optstring[i] == ':') {

		optarg = 0;

		optarg = NULL;

		if (optstring[i + 1] != ':' || __optpos) {

			optarg = argv[optind++];

			if (__optpos)

tools/include/nolibc/sys.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static __attribute__((unused)) 
void *sbrk(intptr_t inc)

{

	/* first call to find current end */

	void *ret = sys_brk(0);

	void *ret = sys_brk(NULL);



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

		return ret + inc;

tools/include/nolibc/sys/reboot.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ ssize_t sys_reboot(int magic1, int magic2, int cmd, void *arg) 
static __attribute__((unused))

int reboot(int cmd)

{

	return __sysret(sys_reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, 0));

	return __sysret(sys_reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, NULL));

}



#endif /* _NOLIBC_SYS_REBOOT_H */

tools/include/nolibc/unistd.h

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int msleep(unsigned int msecs) 
{

	struct timeval my_timeval = { msecs / 1000, (msecs % 1000) * 1000 };



	if (sys_select(0, 0, 0, 0, &my_timeval) < 0)

	if (sys_select(0, NULL, NULL, NULL, &my_timeval) < 0)

		return (my_timeval.tv_sec * 1000) +

			(my_timeval.tv_usec / 1000) +

			!!(my_timeval.tv_usec % 1000);
@@ -67,7 +67,7 @@ unsigned int sleep(unsigned int seconds) 
{

	struct timeval my_timeval = { seconds, 0 };



	if (sys_select(0, 0, 0, 0, &my_timeval) < 0)

	if (sys_select(0, NULL, NULL, NULL, &my_timeval) < 0)

		return my_timeval.tv_sec + !!my_timeval.tv_usec;

	else

		return 0;
@@ -78,7 +78,7 @@ int usleep(unsigned int usecs) 
{

	struct timeval my_timeval = { usecs / 1000000, usecs % 1000000 };



	return sys_select(0, 0, 0, 0, &my_timeval);

	return sys_select(0, NULL, NULL, NULL, &my_timeval);

}



static __attribute__((unused))