File _service:tar_scm:backport-clang-0011-misc-Suppr... of Package glibc

File _service:tar_scm:backport-clang-0011-misc-Suppress-clang-warnings-on-syslog.patch of Package glibc (Revision 0dff412b25878fda2a46e1d301aaf81e)

Currently displaying revision 0dff412b25878fda2a46e1d301aaf81e , Show latest

From c9730cb3e225d070f29626c22a3e15553163837f Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri, 29 Apr 2022 10:50:13 -0300
Subject: [PATCH] misc: Suppress clang warnings on syslog

clang complains that adding a 'int_t' to a string does not append
to it, but the idea is to print the pid conditionally.
---
 misc/syslog.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/misc/syslog.c b/misc/syslog.c
index 1b8cb722c5..ab1e46ff7d 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -31,6 +31,7 @@
 static char sccsid[] = "@(#)syslog.c	8.4 (Berkeley) 3/18/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include <libc-diag.h>
 #include <libio/libioP.h>
 #include <paths.h>
 #include <stdarg.h>
@@ -177,6 +178,10 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
 #define SYSLOG_HEADER_WITHOUT_TS(__pri, __msgoff)        \
   "<%d>: %n", __pri, __msgoff
 
+   /* clang complains that adding a 'int_t' to a string does not append to it,
+      but the idea is to print the pid conditionally.  */
+  DIAG_PUSH_NEEDS_COMMENT_CLANG;
+  DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int");
   int l;
   if (has_ts)
     l = __snprintf (bufs, sizeof bufs,
@@ -184,6 +189,8 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
   else
     l = __snprintf (bufs, sizeof bufs,
 		    SYSLOG_HEADER_WITHOUT_TS (pri, &msgoff));
+  DIAG_POP_NEEDS_COMMENT_CLANG;
+
   if (0 <= l && l < sizeof bufs)
     {
       va_list apc;
@@ -209,6 +216,8 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
 	  /* Tell the cancellation handler to free this buffer.  */
 	  clarg.buf = buf;
 
+	  DIAG_PUSH_NEEDS_COMMENT_CLANG;
+	  DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int");
 	  if (has_ts)
 	    __snprintf (buf, l + 1,
 			SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
@@ -221,6 +230,7 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
 	  __vsnprintf_internal (buf + l, bufsize - l + 1, fmt, apc,
 				mode_flags);
 	  va_end (apc);
+	  DIAG_POP_NEEDS_COMMENT_CLANG;
 	}
       else
         {
@@ -233,8 +243,13 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
 
   /* Output to stderr if requested. */
   if (LogStat & LOG_PERROR)
-    __dprintf (STDERR_FILENO, "%s%s", buf + msgoff,
-	       "\n" + (buf[bufsize - 1] == '\n'));
+    {
+      DIAG_PUSH_NEEDS_COMMENT_CLANG;
+      DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int");
+      __dprintf (STDERR_FILENO, "%s%s", buf + msgoff,
+		 "\n" + (buf[bufsize - 1] == '\n'));
+      DIAG_POP_NEEDS_COMMENT_CLANG;
+    }
 
   /* Get connected, output the message to the local logger.  */
   if (!connected)
-- 
2.39.3