AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2025-02-04 16:04:24 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

modprobe: use prio_to_str() helper

Browse Source
This commit is contained in:
Lucas De Marchi 2012-10-31 22:00:40 -02:00
parent 4434d8ba36
commit 1e947e3c87
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/modprobe.c
View File

@ -152,21 +152,10 @@ static inline void _show(const char *fmt, ...)
va_end(args);
}
static inline void _log(int prio, const char *fmt, ...)
static _always_inline_ const char *prio_to_str(int prio)
{
const char *prioname;
char buf[32], *msg;
va_list args;
if (prio > verbose)
return;
va_start(args, fmt);
if (vasprintf(&msg, fmt, args) < 0)
msg = NULL;
va_end(args);
if (msg == NULL)
return;
char buf[32];
switch (prio) {
case LOG_CRIT:
@ -192,6 +181,27 @@ static inline void _log(int prio, const char *fmt, ...)
prioname = buf;
}
return prioname;
}
static inline void _log(int prio, const char *fmt, ...)
{
const char *prioname;
char *msg;
va_list args;
if (prio > verbose)
return;
va_start(args, fmt);
if (vasprintf(&msg, fmt, args) < 0)
msg = NULL;
va_end(args);
if (msg == NULL)
return;
prioname = prio_to_str(prio);
if (use_syslog)
syslog(LOG_NOTICE, "%s: %s", prioname, msg);
else
@ -789,32 +799,8 @@ static char **prepend_options_from_env(int *p_argc, char **orig_argv)
static void log_syslog(void *data, int priority, const char *file, int line,
const char *fn, const char *format, va_list args)
{
char *str, buf[32];
const char *prioname;
switch (priority) {
case LOG_CRIT:
prioname = "FATAL";
break;
case LOG_ERR:
prioname = "ERROR";
break;
case LOG_WARNING:
prioname = "WARNING";
break;
case LOG_NOTICE:
prioname = "NOTICE";
break;
case LOG_INFO:
prioname = "INFO";
break;
case LOG_DEBUG:
prioname = "DEBUG";
break;
default:
snprintf(buf, sizeof(buf), "LOG-%03d", priority);
prioname = buf;
}
char *str;
const char *prioname = prio_to_str(priority);
if (vasprintf(&str, format, args) < 0)
return;