From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id r/D5N5Z9gWByWwAAWB0awg (envelope-from ) for ; Thu, 22 Apr 2021 09:43:50 -0400 Received: by simark.ca (Postfix, from userid 112) id D85511F104; Thu, 22 Apr 2021 09:43:50 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 2C6AD1E783 for ; Thu, 22 Apr 2021 09:43:50 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 28E5B3896813; Thu, 22 Apr 2021 13:43:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 28E5B3896813 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1619099029; bh=WracfopXKQ9WNUKthILDxPvfWSB7Y21l0Sd+W3/LKwI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=AWrhDGDfKEclUvRGVcYgFLm3MG5bCGxlRJizu+fP6n+Pwesokso3iC8MpJH4PbeyR Gq+bYlGSALL1JOiFGD4/qus5GU3XuzDa6RfcFr3DStIjMywOIcfMd49CDe3+7+CmVI PWNCOElPOnR4+BDml5U8NLsYhcBvK+i/ZPVRUUaY= Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 756F43894C36 for ; Thu, 22 Apr 2021 13:43:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 756F43894C36 X-ASG-Debug-ID: 1619099025-0c856e67e2dd3900001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id U6eFbIKRbcLv6a5U (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 22 Apr 2021 09:43:45 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id 62C81441B21; Thu, 22 Apr 2021 09:43:45 -0400 (EDT) X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH] sim: sprinkle some ATTRIBUTE_PRINTF Date: Thu, 22 Apr 2021 09:43:44 -0400 X-ASG-Orig-Subj: [PATCH] sim: sprinkle some ATTRIBUTE_PRINTF Message-Id: <20210422134344.3303416-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1619099025 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 3535 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.89430 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Add some ATTRIBUTE_PRINTF attributes to functions that take a format string, to fix a few -Wformat-nonliteral warnings. Use the ATTRIBUTE_PRINTF macro like we use in GDB, instead of spelling out __attribute__((format...)). Use ATTRIBUTE_NULL_PRINTF at one place, because callers expect to be able to pass NULL. sim/common/ChangeLog: * callback.c (os_printf_filtered, os_vprintf_filtered, os_evprintf_filtered, os_error): Use ATTRIBUTE_PRINTF. * sim-engine.h (sim_engine_abort, sim_engine_vabort): Likewise. * sim-events.h (sim_events_schedule_tracef, sim_events_schedule_vtracef): Use ATTRIBUTE_NULL_PRINTF. Change-Id: Icd206f7b2c325e8b144f72eb129fb2a6b5af2fa3 --- sim/common/callback.c | 8 ++++---- sim/common/sim-engine.h | 4 ++-- sim/common/sim-events.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/common/callback.c b/sim/common/callback.c index f9e848fd913d..2fec2704f3e0 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -639,7 +639,7 @@ os_init (host_callback *p) /* DEPRECATED */ /* VARARGS */ -static void +static void ATTRIBUTE_PRINTF (2, 3) os_printf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...) { va_list args; @@ -650,14 +650,14 @@ os_printf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...) } /* VARARGS */ -static void +static void ATTRIBUTE_PRINTF (2, 0) os_vprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args) { vprintf (format, args); } /* VARARGS */ -static void +static void ATTRIBUTE_PRINTF (2, 0) os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args) { vfprintf (stderr, format, args); @@ -667,7 +667,7 @@ os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_ #ifdef __GNUC__ __attribute__ ((__noreturn__)) #endif -static void +static void ATTRIBUTE_PRINTF (2, 3) os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...) { va_list args; diff --git a/sim/common/sim-engine.h b/sim/common/sim-engine.h index 25d06f774de0..5adce8deedbc 100644 --- a/sim/common/sim-engine.h +++ b/sim/common/sim-engine.h @@ -115,14 +115,14 @@ extern void sim_engine_abort sim_cpu *cpu, sim_cia cia, const char *fmt, - ...) __attribute__ ((format (printf, 4, 5))) __attribute__ ((noreturn)); + ...) ATTRIBUTE_PRINTF (4, 5) __attribute__ ((noreturn)); extern void sim_engine_vabort (SIM_DESC sd, sim_cpu *cpu, sim_cia cia, const char *fmt, - va_list ap) __attribute__ ((noreturn)); + va_list ap) ATTRIBUTE_PRINTF (4, 0) __attribute__ ((noreturn)); /* No abort hook - when possible this function exits using the engine_halt function (and SIM_ENGINE_HALT_HOOK). */ diff --git a/sim/common/sim-events.h b/sim/common/sim-events.h index 7a5fc9665d21..3f1501ea67cd 100644 --- a/sim/common/sim-events.h +++ b/sim/common/sim-events.h @@ -117,7 +117,7 @@ extern sim_event *sim_events_schedule_tracef sim_event_handler *handler, void *data, const char *fmt, - ...) __attribute__ ((format (printf, 5, 6))); + ...) ATTRIBUTE_NULL_PRINTF (5, 6); extern sim_event *sim_events_schedule_vtracef (SIM_DESC sd, @@ -125,7 +125,7 @@ extern sim_event *sim_events_schedule_vtracef sim_event_handler *handler, void *data, const char *fmt, - va_list ap); + va_list ap) ATTRIBUTE_NULL_PRINTF (5, 0); extern void sim_events_schedule_after_signal -- 2.30.1