Commit c405c37b authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

tools lib api: Renaming pr_warning to pr_warn 

For kernel logging macro, pr_warning is completely removed and
replaced by pr_warn, using pr_warn in tools lib api for symmetry
to kernel logging macro, then we could drop pr_warning in the
whole linux code.

Changing __pr_warning to __pr_warn to be consistent.

Link: http://lkml.kernel.org/r/20191018031850.48498-30-wangkefeng.wang@huawei.com


To: linux-kernel@vger.kernel.org
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 2304d447

tools/lib/api/debug-internal.h

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ do { \ 
		(func)("libapi: " fmt, ##__VA_ARGS__); \

} while (0)



extern libapi_print_fn_t __pr_warning;

extern libapi_print_fn_t __pr_warn;

extern libapi_print_fn_t __pr_info;

extern libapi_print_fn_t __pr_debug;



#define pr_warning(fmt, ...)	__pr(__pr_warning, fmt, ##__VA_ARGS__)

#define pr_warn(fmt, ...)	__pr(__pr_warn, fmt, ##__VA_ARGS__)

#define pr_info(fmt, ...)	__pr(__pr_info, fmt, ##__VA_ARGS__)

#define pr_debug(fmt, ...)	__pr(__pr_debug, fmt, ##__VA_ARGS__)

tools/lib/api/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static int __base_pr(const char *format, ...) 
	return err;

}



libapi_print_fn_t __pr_warning = __base_pr;

libapi_print_fn_t __pr_warn    = __base_pr;

libapi_print_fn_t __pr_info    = __base_pr;

libapi_print_fn_t __pr_debug;
@@ -23,7 +23,7 @@ void libapi_set_print(libapi_print_fn_t warn, 
		      libapi_print_fn_t info,

		      libapi_print_fn_t debug)

{

	__pr_warning = warn;

	__pr_warn    = warn;

	__pr_info    = info;

	__pr_debug   = debug;

}

tools/lib/api/fs/fs.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep) 
		n = read(fd, bf + size, alloc_size - size);

		if (n < 0) {

			if (size) {

				pr_warning("read failed %d: %s\n", errno,

				pr_warn("read failed %d: %s\n", errno,

					strerror_r(errno, sbuf, sizeof(sbuf)));

				err = 0;

			} else

CRA Git | Maintained and supported by SUSTech CRA and CCSE