From 4552e41025af4694c55854448c3ae4d95e72c7f6 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 13 Aug 2012 21:51:16 +0200 Subject: trace/simple: Replace asprintf by g_strdup_printf asprintf is not available for all hosts. g_strdup_printf is more portable and simplifies the code because if does not need error handling. The static variable does not need an explicit assignment to be NULL. Cc: Stefan Hajnoczi Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- trace/simple.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'trace') diff --git a/trace/simple.c b/trace/simple.c index 8e175ece73..d83681b227 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -55,7 +55,7 @@ static unsigned int trace_idx; static unsigned int writeout_idx; static uint64_t dropped_events; static FILE *trace_fp; -static char *trace_file_name = NULL; +static char *trace_file_name; /* * Trace buffer entry */ typedef struct { @@ -329,18 +329,12 @@ bool st_set_trace_file(const char *file) { st_set_trace_file_enabled(false); - free(trace_file_name); + g_free(trace_file_name); if (!file) { - if (asprintf(&trace_file_name, CONFIG_TRACE_FILE, getpid()) < 0) { - trace_file_name = NULL; - return false; - } + trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, getpid()); } else { - if (asprintf(&trace_file_name, "%s", file) < 0) { - trace_file_name = NULL; - return false; - } + trace_file_name = g_strdup_printf("%s", file); } st_set_trace_file_enabled(true); -- cgit v1.2.1