Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <635523a920bcc317eaf48230f003cd050f51c9bb.camel@perches.com>
Subject: Re: [PATCH 1/2] modpost: rework and consolidate logging interface
From:   Joe Perches <joe@perches.com>
To:     Jessica Yu <jeyu@kernel.org>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Matthias Maennich <maennich@google.com>
Cc:     linux-kernel@vger.kernel.org
Date:   Tue, 25 Feb 2020 14:30:51 -0800
In-Reply-To: <20200225173526.9617-1-jeyu@kernel.org>
References: <20200225173526.9617-1-jeyu@kernel.org>
Content-Type: text/plain; charset="ISO-8859-1"
User-Agent: Evolution 3.34.1-2 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, 2020-02-25 at 18:35 +0100, Jessica Yu wrote:
> Rework modpost's logging interface by consolidating merror(), warn(),
> and fatal() to use a single function, modpost_log(). Introduce different
> logging levels (WARN, ERROR, FATAL) as well as a conditional warn
> (warn_unless()). The conditional warn is useful in determining whether
> to use merror() or warn() based on a condition. This reduces code
> duplication overall.
[]
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
[]
> @@ -51,41 +51,39 @@ enum export {
>  
>  #define MODULE_NAME_LEN (64 - sizeof(Elf_Addr))
>  
> -#define PRINTF __attribute__ ((format (printf, 1, 2)))
> +#define PRINTF __attribute__ ((format (printf, 2, 3)))
>  
> -PRINTF void fatal(const char *fmt, ...)
> +PRINTF void modpost_log(enum loglevel loglevel, const char *fmt, ...)
>  {
> +	char *level = NULL;
>  	va_list arglist;
>  
> -	fprintf(stderr, "FATAL: ");
> +	switch(loglevel) {
> +	case(LOG_WARN):
> +		level = "WARNING: ";
> +		break;
> +	case(LOG_ERROR):
> +		level = "ERROR: ";
> +		break;
> +	case(LOG_FATAL):
> +		level = "FATAL: ";
> +		break;
> +	default: /* invalid loglevel, ignore */
> +		break;

Odd parentheses around case labels and
likely level should be initialized as ""
and not NULL.

	const char *level = "";
	...
	switch (loglevel) {
	case LOG_WARN:
		level = "WARNING: ";
		break;
	...
	}