From 521e7c3aea7cfc478380acb9857beb938855f00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Apr 2017 18:49:49 -0400 Subject: [PATCH] journal/fsprg: set -Wno-pointer-arithm only for that file Both gcc and clang issue a host of warnings about void pointers used in arithmetic. The warning must be ignored in that file to avoid multiple warnings. Makefile.am used to set this for all libsystemd-journal-internal.a sources, because there's no finer granularity for warnings. Let's just set it for this one file. --- Makefile.am | 4 +--- src/journal/fsprg.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4ba230569a..e362060326 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4556,10 +4556,8 @@ libsystemd_journal_internal_la_SOURCES += \ libsystemd_journal_internal_la_LIBADD += \ $(GCRYPT_LIBS) -# fsprg.c is a drop-in file using void pointer arithmetic libsystemd_journal_internal_la_CFLAGS += \ - $(GCRYPT_CFLAGS) \ - -Wno-pointer-arith + $(GCRYPT_CFLAGS) endif noinst_LTLIBRARIES += \ diff --git a/src/journal/fsprg.c b/src/journal/fsprg.c index 612b10f3a9..e7c22880be 100644 --- a/src/journal/fsprg.c +++ b/src/journal/fsprg.c @@ -40,6 +40,9 @@ #define RND_GEN_Q 0x02 #define RND_GEN_X 0x03 +#pragma GCC diagnostic ignored "-Wpointer-arith" +/* TODO: remove void* arithmetic and this work-around */ + /******************************************************************************/ static void mpi_export(void *buf, size_t buflen, const gcry_mpi_t x) {