commit 1e09a84aafcadfcc6dc453f0a4791e50317e569a
author Michael Krebs <mkrebs@chromium.org> Wed Apr 18 12:34:13 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Apr 18 14:40:50 2012 -0700
tree a5859241c2c9afc67ba113e1970687348a577210
parent 7672bfb67e75d74745f6e655571b41dd83ca4046

crash-reporter: Move disabling of GCC warning into source file

Rather than disable the "format not a string literal, argument types not
checked" warning for the entire kernel_collector.cc file, only disable it
for the code in question.

BUG=chromium-os:27127
TEST=Ran unittests

Change-Id: Id85e7945779cd5d1b6a3b68cfdedae53b3f22c74
Reviewed-on: https://gerrit.chromium.org/gerrit/20484
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Michael Krebs <mkrebs@chromium.org>
Tested-by: Michael Krebs <mkrebs@chromium.org>

crash_reporter/Makefile

diff --git a/crash_reporter/Makefile b/crash_reporter/Makefile
index 085b7de..d123a80 100644
--- a/crash_reporter/Makefile
+++ b/crash_reporter/Makefile
@@ -24,10 +24,6 @@
 
 
 # -- Executable crash_reporter --
-# Disable error "format not a string literal, argument types not checked" for
-# the StringPrintf() in KernelCollector::GetRamoopsRecordPath() because it's
-# valid, but GNU apparently doesn't bother checking a const format string.
-kernel_collector.o: CXXFLAGS += -Wno-format-nonliteral
 
 CXX_BINARY(crash_reporter): LDLIBS += -lmetrics
 CXX_BINARY(crash_reporter): crash_reporter.o $(CRASH_OBJS)
@@ -36,6 +32,7 @@
 
 
 # -- Executable list_proxies --
+
 LIST_PROXIES_PKGS = dbus-1 dbus-glib-1
 LIST_PROXIES_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LIST_PROXIES_PKGS))
 LIST_PROXIES_LIBS := $(shell $(PKG_CONFIG) --libs $(LIST_PROXIES_PKGS))

crash_reporter/kernel_collector.cc

diff --git a/crash_reporter/kernel_collector.cc b/crash_reporter/kernel_collector.cc
index e15dc85..fc8500e 100644
--- a/crash_reporter/kernel_collector.cc
+++ b/crash_reporter/kernel_collector.cc
@@ -96,7 +96,13 @@
 
 void KernelCollector::GetRamoopsRecordPath(FilePath *path,
                                            size_t record) {
+  // Disable error "format not a string literal, argument types not checked"
+  // because this is valid, but GNU apparently doesn't bother checking a const
+  // format string.
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wformat-nonliteral"
   *path = ramoops_dump_path_.Append(StringPrintf(kDumpFormat, record));
+  #pragma GCC diagnostic pop
 }
 
 bool KernelCollector::LoadParameters() {