xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools lib api: Renaming pr_warning to pr_warn

Browse Source 
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: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
Kefeng Wang
2019-10-18 11:18:47 +08:00
committed by Petr Mladek
parent 2304d447f9
commit c405c37bd9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lib/api/debug-internal.h
View File

@@ -10,11 +10,11 @@ do { \
(func)("libapi: " fmt, ##__VA_ARGS__); \ (func)("libapi: " fmt, ##__VA_ARGS__); \
} while (0) } 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_info;
extern libapi_print_fn_t __pr_debug; 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_info(fmt, ...) __pr(__pr_info, fmt, ##__VA_ARGS__)
#define pr_debug(fmt, ...) __pr(__pr_debug, fmt, ##__VA_ARGS__) #define pr_debug(fmt, ...) __pr(__pr_debug, fmt, ##__VA_ARGS__)

4
tools/lib/api/debug.c
View File

@@ -15,7 +15,7 @@ static int __base_pr(const char *format, ...)
return err; 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_info = __base_pr;
libapi_print_fn_t __pr_debug; 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 info,
libapi_print_fn_t debug) libapi_print_fn_t debug)
{ {
__pr_warning = warn; __pr_warn = warn;
__pr_info = info; __pr_info = info;
__pr_debug = debug; __pr_debug = debug;
} }

4
tools/lib/api/fs/fs.c
View File

@@ -381,8 +381,8 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep)
n = read(fd, bf + size, alloc_size - size); n = read(fd, bf + size, alloc_size - size);
if (n < 0) { if (n < 0) {
if (size) { if (size) {
pr_warning("read failed %d: %s\n", errno, pr_warn("read failed %d: %s\n", errno,
strerror_r(errno, sbuf, sizeof(sbuf))); strerror_r(errno, sbuf, sizeof(sbuf)));
err = 0; err = 0;
} else } else
err = -errno; err = -errno;