AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 15:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: Suppress clang warnings on syslog

Browse Source 
clang complains that adding a 'int_t' to a string does not append
to it, but the idea is to print the pid conditionally.
This commit is contained in:
Adhemerval Zanella 2022-04-29 10:50:13 -03:00
parent 79be9c6153
commit ed63857295
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
misc/syslog.c
View File

@ -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>
@ -181,8 +182,15 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
int l, vl;
if (has_ts)
l = __snprintf (bufs, sizeof bufs,
SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
{
/* 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");
l = __snprintf (bufs, sizeof bufs,
SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
DIAG_POP_NEEDS_COMMENT_CLANG;
}
else
l = __snprintf (bufs, sizeof bufs,
SYSLOG_HEADER_WITHOUT_TS (pri, &msgoff));
@ -239,8 +247,13 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
int cl;
if (has_ts)
cl = __snprintf (buf, l + 1,
SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
{
DIAG_PUSH_NEEDS_COMMENT_CLANG;
DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int");
cl = __snprintf (buf, l + 1,
SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
DIAG_POP_NEEDS_COMMENT_CLANG;
}
else
cl = __snprintf (buf, l + 1,
SYSLOG_HEADER_WITHOUT_TS (pri, &msgoff));
@ -273,8 +286,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)