aboutsummaryrefslogtreecommitdiff
blob: be0b07a8bbbe3adf8c96cd2c293dc4ab789eb7b2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
--- a/gcc/c-family/c-common.c	2012-02-13 21:12:54.000000000 +0100
+++ b/gcc/c-family/c-common.c	2012-07-09 23:17:18.375234684 +0200
@@ -202,7 +202,19 @@ int warn_unknown_pragmas; /* Tri state v
 /* Warn about format/argument anomalies in calls to formatted I/O functions
    (*printf, *scanf, strftime, strfmon, etc.).  */
 
+#ifdef ENABLE_ESPF
+int warn_format = 1;
+#else
 int warn_format;
+#endif
+
+/* Warn about possible security problems with format functions.  */
+
+#ifdef ENABLE_ESPF
+int warn_format_security = 1;
+#else
+int warn_format_security;
+#endif
 
 /* C/ObjC language option variables.  */
 
--- a/gcc/c-family/c-common.h	2011-12-20 21:44:13.000000000 +0100
+++ b/gcc/c-family/c-common.h	2012-07-09 23:16:33.355233344 +0200
@@ -594,6 +594,9 @@ extern int warn_unknown_pragmas; /* Tri
 
 extern int warn_format;
 
+/* Warn about possible security problems with format functions.  */
+
+extern int warn_format_security;
 
 /* C/ObjC language option variables.  */
 
--- a/gcc/c-family/c.opt	2012-02-06 11:31:18.000000000 +0100
+++ b/gcc/c-family/c.opt	2012-07-09 22:07:11.449109322 +0200
@@ -392,7 +392,7 @@ C ObjC C++ ObjC++ Var(warn_format_contai
 Warn about format strings that contain NUL bytes
 
 Wformat-security
-C ObjC C++ ObjC++ Var(warn_format_security) Warning
+C ObjC C++ ObjC++ Warning
 Warn about possible security problems with format functions
 
 Wformat-y2k