开源软件构建与测试

Changes of Revision 11

_service:tar_scm:glibc.spec Changed

_service:tar_scm:backport-clang-0011-misc-Suppress-clang-warnings-on-syslog.patch Changed

@@ -1,16 +1,14 @@
-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
+From a0dd7c2e8c5c561d34f8ea58b9ad95e5f20329ee Mon Sep 17 00:00:00 2001
+From: luofeng <luofeng13@huawei.com>
+Date: Thu, 11 Apr 2024 21:37:06 +0800
+Subject: PATCH backport-clang-0011-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(-)
+ misc/syslog.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/misc/syslog.c b/misc/syslog.c
-index 1b8cb722c5..ab1e46ff7d 100644
+index 4af87f5..c92787e 100644
 --- a/misc/syslog.c
 +++ b/misc/syslog.c
 @@ -31,6 +31,7 @@
@@ -21,7 +19,7 @@
  #include <libio/libioP.h>
  #include <paths.h>
  #include <stdarg.h>
-@@ -177,6 +178,10 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
+@@ -179,6 +180,10 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
  #define SYSLOG_HEADER_WITHOUT_TS(__pri, __msgoff)        \
    "<%d>: %n", __pri, __msgoff
  
@@ -29,36 +27,37 @@
 +      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;
+   int l, vl;
    if (has_ts)
      l = __snprintf (bufs, sizeof bufs,
-@@ -184,6 +189,8 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
+@@ -186,6 +191,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.  */
++  
+   if (l < 0)
+     goto out;
+ 
+@@ -238,6 +245,8 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
  	  clarg.buf = buf;
  
+ 	  int cl;
 +	  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);
+ 	    cl = __snprintf (buf, l + 1,
+ 			     SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
+@@ -252,7 +261,7 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
+ 	  cl = __vsnprintf_internal (buf + l, bufsize - l + 1, fmt, apc,
+ 				     mode_flags);
  	  va_end (apc);
-+	  DIAG_POP_NEEDS_COMMENT_CLANG;
+-
++    DIAG_POP_NEEDS_COMMENT_CLANG;
+ 	  if (cl != vl)
+ 	    goto out;
  	}
-       else
-         {
-@@ -233,8 +243,13 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
+@@ -273,8 +282,13 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
  
    /* Output to stderr if requested. */
    if (LogStat & LOG_PERROR)
@@ -75,4 +74,5 @@
    /* Get connected, output the message to the local logger.  */
    if (!connected)
 -- 
-2.39.3
+2.19.1
+