From f5050d0fcd2c442ce07997ab75071d44734ab8c9 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 10 Nov 2022 23:40:11 +0800 Subject: [PATCH] util: Replace the usage of os_get_command_line with util_get_command_line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- src/gallium/auxiliary/driver_ddebug/dd_draw.c | 2 +- src/gallium/auxiliary/os/os_process.h | 7 ------- src/gallium/drivers/radeonsi/si_debug.c | 2 +- src/gallium/drivers/svga/svga_screen.c | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/gallium/auxiliary/driver_ddebug/dd_draw.c b/src/gallium/auxiliary/driver_ddebug/dd_draw.c index 6dd4a12fa7e..48de3ff5b1a 100644 --- a/src/gallium/auxiliary/driver_ddebug/dd_draw.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_draw.c @@ -106,7 +106,7 @@ void dd_write_header(FILE *f, struct pipe_screen *screen, unsigned apitrace_call_number) { char cmd_line[4096]; - if (os_get_command_line(cmd_line, sizeof(cmd_line))) + if (util_get_command_line(cmd_line, sizeof(cmd_line))) fprintf(f, "Command: %s\n", cmd_line); fprintf(f, "Driver vendor: %s\n", screen->get_vendor(screen)); fprintf(f, "Device vendor: %s\n", screen->get_device_vendor(screen)); diff --git a/src/gallium/auxiliary/os/os_process.h b/src/gallium/auxiliary/os/os_process.h index d22283aec7d..35a80c31129 100644 --- a/src/gallium/auxiliary/os/os_process.h +++ b/src/gallium/auxiliary/os/os_process.h @@ -41,11 +41,4 @@ os_get_process_name(char *str, size_t size) } -static inline bool -os_get_command_line(char *cmdline, size_t size) -{ - return util_get_command_line(cmdline, size); -} - - #endif /* OS_PROCESS_H */ diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 48292b773c3..ac78dd7a7c2 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -1067,7 +1067,7 @@ void si_check_vm_faults(struct si_context *sctx, struct radeon_saved_cs *saved, return; fprintf(f, "VM fault report.\n\n"); - if (os_get_command_line(cmd_line, sizeof(cmd_line))) + if (util_get_command_line(cmd_line, sizeof(cmd_line))) fprintf(f, "Command: %s\n", cmd_line); fprintf(f, "Driver vendor: %s\n", screen->get_vendor(screen)); fprintf(f, "Device vendor: %s\n", screen->get_device_vendor(screen)); diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index afc86163067..1b446b2595d 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -1016,7 +1016,7 @@ init_logging(struct pipe_screen *screen) */ if (debug_get_bool_option("SVGA_EXTRA_LOGGING", FALSE)) { char cmdline[1000]; - if (os_get_command_line(cmdline, sizeof(cmdline))) { + if (util_get_command_line(cmdline, sizeof(cmdline))) { snprintf(host_log, sizeof(host_log) - strlen(log_prefix), "%s%s\n", log_prefix, cmdline); svgascreen->sws->host_log(svgascreen->sws, host_log);