From 3cb5a3a16af2cae1a5059b7571c514b3fa575df9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 5 Dec 2019 08:15:51 -0700 Subject: [PATCH] Suppress ARI warnings for vsprintf A few spots can validly call vsprintf; this adds ARI markers to suppress warnings at these places. gdb/ChangeLog 2019-12-13 Tom Tromey * gdbsupport/common-utils.c (string_printf, string_vprintf) (string_vappendf): Add ARI comment. Change-Id: Ia8665aa5d7b7331a3985b18626b19764a264447b --- gdb/ChangeLog | 5 +++++ gdb/gdbsupport/common-utils.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d107b6cea7..0e1f484e51 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-13 Tom Tromey + + * gdbsupport/common-utils.c (string_printf, string_vprintf) + (string_vappendf): Add ARI comment. + 2019-12-13 Tom Tromey * contrib/ari/gdb_ari.sh: Remove "fix" call for diff --git a/gdb/gdbsupport/common-utils.c b/gdb/gdbsupport/common-utils.c index d1059de0b3..33f9bf6a57 100644 --- a/gdb/gdbsupport/common-utils.c +++ b/gdb/gdbsupport/common-utils.c @@ -89,7 +89,7 @@ string_printf (const char* fmt, ...) /* C++11 and later guarantee std::string uses contiguous memory and always includes the terminating '\0'. */ va_start (vp, fmt); - vsprintf (&str[0], fmt, vp); + vsprintf (&str[0], fmt, vp); /* ARI: vsprintf */ va_end (vp); return str; @@ -111,7 +111,7 @@ string_vprintf (const char* fmt, va_list args) /* C++11 and later guarantee std::string uses contiguous memory and always includes the terminating '\0'. */ - vsprintf (&str[0], fmt, args); + vsprintf (&str[0], fmt, args); /* ARI: vsprintf */ return str; } @@ -147,7 +147,7 @@ string_vappendf (std::string &str, const char *fmt, va_list args) /* C++11 and later guarantee std::string uses contiguous memory and always includes the terminating '\0'. */ - vsprintf (&str[curr_size], fmt, args); + vsprintf (&str[curr_size], fmt, args); /* ARI: vsprintf */ } char * -- 2.34.1