Skip to content

logger: rename asprintf and vasprintf #5045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Dec 2, 2021
Merged

logger: rename asprintf and vasprintf #5045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions tools/logger/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ char *format_uid_raw(const struct sof_uuid_entry *uid_entry, int use_colors, int
uint16_t c = be ? htobe16(uid_val->c) : uid_val->c;
char *str;

str = asprintf(upper ? UUID_UPPER : UUID_LOWER,
use_colors ? KBLU : "",
name_first ? uid_entry->name : "",
name_first ? " " : "",
a, b, c,
uid_val->d[0], uid_val->d[1], uid_val->d[2],
uid_val->d[3], uid_val->d[4], uid_val->d[5],
uid_val->d[6], uid_val->d[7],
name_first ? "" : " ",
name_first ? "" : uid_entry->name,
use_colors ? KNRM : "");
str = log_asprintf(upper ? UUID_UPPER : UUID_LOWER,
use_colors ? KBLU : "",
name_first ? uid_entry->name : "",
name_first ? " " : "",
a, b, c,
uid_val->d[0], uid_val->d[1], uid_val->d[2],
uid_val->d[3], uid_val->d[4], uid_val->d[5],
uid_val->d[6], uid_val->d[7],
name_first ? "" : " ",
name_first ? "" : uid_entry->name,
use_colors ? KNRM : "");
return str;
}

Expand Down Expand Up @@ -247,7 +247,7 @@ static void process_params(struct proc_ldc_entry *pe,
/* %s format specifier */
/* check for string printing, because it leads to logger crash */
log_err("String printing is not supported\n");
pe->params[i] = (uintptr_t)asprintf("<String @ 0x%08x>", raw_param);
pe->params[i] = (uintptr_t)log_asprintf("<String @ 0x%08x>", raw_param);
pe->subst_mask |= 1 << i;
++i;
p += 2;
Expand Down
4 changes: 2 additions & 2 deletions tools/logger/logger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ static int append_filter_config(struct convert_config *config, const char *input

/* filer_config can't be NULL for following steps */
if (!old_config)
old_config = asprintf("%s", "");
old_config = log_asprintf("%s", "");

config->filter_config = asprintf("%s%s\n", old_config, input);
config->filter_config = log_asprintf("%s%s\n", old_config, input);
free(old_config);
if (!config->filter_config)
return -ENOMEM;
Expand Down
6 changes: 3 additions & 3 deletions tools/logger/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <stdlib.h>
#include <string.h>

char *vasprintf(const char *format, va_list args)
char *log_vasprintf(const char *format, va_list args)
{
va_list args_copy;
int size;
Expand All @@ -29,13 +29,13 @@ char *vasprintf(const char *format, va_list args)
return result;
}

char *asprintf(const char *format, ...)
char *log_asprintf(const char *format, ...)
{
va_list args;
char *result;

va_start(args, format);
result = vasprintf(format, args);
result = log_vasprintf(format, args);
va_end(args);

return result;
Expand Down
4 changes: 2 additions & 2 deletions tools/logger/misc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
#include <stdarg.h>
#include <stdlib.h>

char *vasprintf(const char *format, va_list args);
char *log_vasprintf(const char *format, va_list args);

#ifdef __GNUC__
__attribute__((format(printf, 1, 2)))
#endif
char *asprintf(const char *format, ...);
char *log_asprintf(const char *format, ...);

#ifdef __GNUC__
__attribute__((format(printf, 1, 2)))
Expand Down