From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7667 invoked by alias); 29 Mar 2010 20:39:24 -0000 Received: (qmail 7501 invoked by uid 22791); 29 Mar 2010 20:39:22 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 29 Mar 2010 20:39:16 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 1A5EA67EBD for ; Mon, 29 Mar 2010 20:39:14 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: update device_error() prototype Date: Mon, 29 Mar 2010 20:39:00 -0000 Message-Id: <1269895146-3394-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg01020.txt.bz2 The device_error() takes a printf style string, so update the prototype accordingly. The message should be const and it should use an attribute. This fixes gcc warnings like: sim-core.c: In function 'sim_core_map_attach': sim-core.c:200: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type sim-core.c:237: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type sim-core.c: In function 'sim_core_attach': sim-core.c:304: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type sim-core.c:314: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type sim-core.c:335: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type sim-core.c:348: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type Signed-off-by: Mike Frysinger --- common/: 2010-03-29 Mike Frysinger * sim-core.h (device_error): Add const to message, and add printf format attribute. cris/: 2010-03-29 Mike Frysinger * devices.c (device_error): Add const to message. frv/: 2010-03-29 Mike Frysinger * devices.c (device_error): Add const to message. m32r/: 2010-03-29 Mike Frysinger * devices.c (device_error): Add const to message. sim/common/sim-core.h | 2 +- sim/cris/devices.c | 2 +- sim/frv/devices.c | 2 +- sim/m32r/devices.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sim/common/sim-core.h b/sim/common/sim-core.h index 3fac627..696511c 100644 --- a/sim/common/sim-core.h +++ b/sim/common/sim-core.h @@ -344,7 +344,7 @@ DECLARE_SIM_CORE_READ_N(misaligned,7,8) #if (WITH_DEVICES) /* TODO: create sim/common/device.h */ /* These are defined with each particular cpu. */ -void device_error (device *me, char* message, ...); +void device_error (device *me, const char *message, ...) __attribute__((format (printf, 2, 3))); int device_io_read_buffer(device *me, void *dest, int space, address_word addr, unsigned nr_bytes, SIM_DESC sd, sim_cpu *processor, sim_cia cia); int device_io_write_buffer(device *me, const void *source, int space, address_word addr, unsigned nr_bytes, SIM_DESC sd, sim_cpu *processor, sim_cia cia); #endif diff --git a/sim/cris/devices.c b/sim/cris/devices.c index 7218c66..50032a6 100644 --- a/sim/cris/devices.c +++ b/sim/cris/devices.c @@ -34,7 +34,7 @@ struct _device { char dummy; } cris_devices; void device_error (device *me ATTRIBUTE_UNUSED, - char *message ATTRIBUTE_UNUSED, + const char *message ATTRIBUTE_UNUSED, ...) { abort (); diff --git a/sim/frv/devices.c b/sim/frv/devices.c index 3c028c0..9b0819f 100644 --- a/sim/frv/devices.c +++ b/sim/frv/devices.c @@ -93,4 +93,4 @@ device_io_write_buffer (device *me, const void *source, int space, return nr_bytes; } -void device_error (device *me, char* message, ...) {} +void device_error (device *me, const char *message, ...) {} diff --git a/sim/m32r/devices.c b/sim/m32r/devices.c index cc39d5d..4442f11 100644 --- a/sim/m32r/devices.c +++ b/sim/m32r/devices.c @@ -102,6 +102,6 @@ device_io_write_buffer (device *me, const void *source, int space, } void -device_error (device *me, char *message, ...) +device_error (device *me, const char *message, ...) { } -- 1.7.0.2