Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758638AbXJKQJ5 (ORCPT ); Thu, 11 Oct 2007 12:09:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754906AbXJKQJt (ORCPT ); Thu, 11 Oct 2007 12:09:49 -0400 Received: from rv-out-0910.google.com ([209.85.198.189]:36411 "EHLO rv-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753948AbXJKQJt (ORCPT ); Thu, 11 Oct 2007 12:09:49 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=F8r+OtPcE/0zywphdHPltRVV9L+4QtDqv71xJipYUFq70BPVSFNRkaZ8F4+o2eUnVGeWfVIZAfGDIeqq5873P21gwDTvCqQce53gMDZftOaShAe+ZIyWUI2Bx7+HNMaTzb8TgKnCmGCY+I5urKK8Oo9PsmH8r0qixsq/PIbUCyE= Message-ID: <19f34abd0710110909o2665fc1dsdd32e4c9a2285bc0@mail.gmail.com> Date: Thu, 11 Oct 2007 18:09:47 +0200 From: "Vegard Nossum" To: "Randy Dunlap" Subject: Re: [PATCH] init: Fix printk format strings Cc: trivial@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20071011090103.5c4bad43.randy.dunlap@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1192083422.26648.19.camel@grianne> <20071011084028.2daf0fd9.randy.dunlap@oracle.com> <19f34abd0710110855t58084c62ne3e09227727b7c61@mail.gmail.com> <20071011090103.5c4bad43.randy.dunlap@oracle.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2576 Lines: 63 On 10/11/07, Randy Dunlap wrote: > On Thu, 11 Oct 2007 17:55:16 +0200 Vegard Nossum wrote: > > > On 10/11/07, Randy Dunlap wrote: > > > On Thu, 11 Oct 2007 08:17:02 +0200 Vegard Nossum wrote: > > > > > > > This makes sure printk format strings are string literals containing no > > > > more than a single line. > > > > > > Each patch needs justification (unless it is blatantly obvious). > > > > > > > > > > Signed-off-by: Vegard Nossum > > > > --- > > > > init/calibrate.c | 4 +++- > > > > init/do_mounts_initrd.c | 5 ++++- > > > > init/main.c | 2 +- > > > > 3 files changed, 8 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c > > > > index fd4fc12..ad6174c 100644 > > > > --- a/init/do_mounts_initrd.c > > > > +++ b/init/do_mounts_initrd.c > > > > @@ -98,7 +98,10 @@ static void __init handle_initrd(void) > > > > error = sys_ioctl(fd, BLKFLSBUF, 0); > > > > sys_close(fd); > > > > } > > > > - printk(!error ? "okay\n" : "failed\n"); > > > > + if(error) > > > > + printk("failed\n"); > > > > + else > > > > + printk("okay\n"); > > > > } > > > > } > > > > > > Why this one? > > > and if it must change, use: > > > if (error) > > > but I see little need for the change. > > > > Oops about the space. And it's to make the format string a constant > > literal. If it isn't, you are going to run into trouble with options > > to remove printks at compile-time based on log-level token. I realize > > it's not really an issue at this point in time, but I assume that it > > will eventually make its way into the kernel in some way or another. > > so would this be OK? > > printk("%s\n", error ? "failed" : "okay"); It helps the filtering, but it doesn't help localisation very much, I think. Since for that, you'd only translate the format string, which in this case isn't much to translate. (I do realize that this is a very, very tiny part of the kernel and probably hundreds of other call-sites have much worse problems -- but every little helps, and now that you're at it... :-)) Vegard - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/