From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: To: Paul Mackerras From: David Gibson Subject: [PATCH 1/4] powerpc: Add gcc format warnings to zImage printf() In-Reply-To: <20070321063031.GB30422@localhost.localdomain> Message-Id: <20070321063149.ED879DDE47@ozlabs.org> Date: Wed, 21 Mar 2007 17:31:49 +1100 (EST) Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This patch adds the correct attributes to the zImage's versions of printf to make gcc generate format string mismatch warnings. It also corrects several minor problems with format strings in the zImage thus discovered. Signed-off-by: David Gibson --- arch/powerpc/boot/main.c | 6 +++--- arch/powerpc/boot/stdio.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) Index: working-2.6/arch/powerpc/boot/stdio.h =================================================================== --- working-2.6.orig/arch/powerpc/boot/stdio.h 2007-01-24 12:01:17.000000000 +1100 +++ working-2.6/arch/powerpc/boot/stdio.h 2007-03-20 14:04:41.000000000 +1100 @@ -7,11 +7,11 @@ #define EINVAL 22 /* Invalid argument */ #define ENOSPC 28 /* No space left on device */ -extern int printf(const char *fmt, ...); +extern int printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); #define fprintf(fmt, args...) printf(args) -extern int sprintf(char *buf, const char *fmt, ...); +extern int sprintf(char *buf, const char *fmt, ...) __attribute__((format(printf, 2, 3))); extern int vsprintf(char *buf, const char *fmt, va_list args); Index: working-2.6/arch/powerpc/boot/main.c =================================================================== --- working-2.6.orig/arch/powerpc/boot/main.c 2007-03-20 14:03:26.000000000 +1100 +++ working-2.6/arch/powerpc/boot/main.c 2007-03-20 14:05:13.000000000 +1100 @@ -136,7 +136,7 @@ static struct addr_range prep_kernel(voi } else { if ((unsigned long)_start < ei.memsize) fatal("Insufficient memory for kernel at address 0!" - " (_start=%lx)\n\r", _start); + " (_start=%p)\n\r", _start); } /* Finally, gunzip the kernel */ @@ -145,7 +145,7 @@ static struct addr_range prep_kernel(voi /* discard up to the actual load data */ gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader)); len = gunzip_finish(&gzstate, addr, ei.memsize); - printf("done 0x%lx bytes\n\r", len); + printf("done 0x%x bytes\n\r", len); flush_cache(addr, ei.loadsize); @@ -189,7 +189,7 @@ static struct addr_range prep_initrd(str if (! initrd_addr) fatal("Can't allocate memory for initial " "ramdisk !\n\r"); - printf("Relocating initrd 0x%p <- 0x%p (0x%lx bytes)\n\r", + printf("Relocating initrd 0x%lx <- 0x%p (0x%lx bytes)\n\r", initrd_addr, old_addr, initrd_size); memmove((void *)initrd_addr, old_addr, initrd_size); }