Commit 1b0053a0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: core - strip too long file names in snd_print*() 



When modules are built with M= option, they pass long file paths to
__FILE__.  This results in ugly outputs of snd_print*() when
CONFIG_SND_VERBOSE_PRINTK is set.

This patch adds a check of the path and strips the leading path dirs
if the file name is an absolute path to improve the readability of logs.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 422bef87

sound/core/misc.c

+12 −2
Original line number Diff line number Diff line
@@ -35,8 +35,17 @@ void release_and_free_resource(struct resource *res) 
EXPORT_SYMBOL(release_and_free_resource);



#ifdef CONFIG_SND_VERBOSE_PRINTK

void snd_verbose_printk(const char *file, int line, const char *format, ...)

static const char *sanity_file_name(const char *path)

{

	if (*path == '/')

		return strrchr(path, '/') + 1;

	else

		return path;

}



void snd_verbose_printk(const char *path, int line, const char *format, ...)

{

	const char *file = sanity_file_name(path);

	va_list args;

	

	if (format[0] == '<' && format[1] >= '0' && format[1] <= '7' && format[2] == '>') {
@@ -56,8 +65,9 @@ EXPORT_SYMBOL(snd_verbose_printk); 
#endif



#if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)

void snd_verbose_printd(const char *file, int line, const char *format, ...)

void snd_verbose_printd(const char *path, int line, const char *format, ...)

{

	const char *file = sanity_file_name(path);

	va_list args;

	

	if (format[0] == '<' && format[1] >= '0' && format[1] <= '7' && format[2] == '>') {

CRA Git | Maintained and supported by SUSTech CRA and CCSE