[tidy] build: silence gcc's -Werror=format-string complaints

Pavel Raiskup praiskup at fedoraproject.org
Tue Dec 3 07:26:30 UTC 2013


commit 1d5758d7feb3106fe16bb1e6cb38082d554983ec
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Tue Dec 3 08:25:26 2013 +0100

    build: silence gcc's -Werror=format-string complaints
    
    Version: 0.99.0-31.20091203
    Resolves: #1037356

 tidy-20091203cvs-format.patch |   57 +++++++++++++++++++++++++++++++++++++++++
 tidy.spec                     |    8 +++++-
 2 files changed, 64 insertions(+), 1 deletions(-)
---
diff --git a/tidy-20091203cvs-format.patch b/tidy-20091203cvs-format.patch
new file mode 100644
index 0000000..b1cf8c9
--- /dev/null
+++ b/tidy-20091203cvs-format.patch
@@ -0,0 +1,57 @@
+diff --git a/src/localize.c b/src/localize.c
+index b832c23..e8c8027 100644
+--- a/src/localize.c
++++ b/src/localize.c
+@@ -1373,14 +1373,14 @@ void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code )
+ {
+     ctmbstr fmt = GetFormatFromCode(code);
+     doc->badAccess |= BA_WAI;
+-    messageNode( doc, TidyAccess, node, fmt );
++    messageNode( doc, TidyAccess, node, "%s", fmt );
+ }
+ 
+ void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code )
+ {
+     ctmbstr fmt = GetFormatFromCode(code);
+     doc->badAccess |= BA_WAI;
+-    messageNode( doc, TidyAccess, node, fmt );
++    messageNode( doc, TidyAccess, node, "%s", fmt );
+ }
+ 
+ #endif /* SUPPORT_ACCESSIBILITY_CHECKS */
+@@ -1399,7 +1399,7 @@ void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+     switch (code)
+     {
+     case NESTED_QUOTATION:
+-        messageNode(doc, TidyWarning, rpt, fmt);
++        messageNode(doc, TidyWarning, rpt, "%s", fmt);
+         break;
+ 
+     case OBSOLETE_ELEMENT:
+@@ -1480,7 +1480,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+     case INCONSISTENT_NAMESPACE:
+     case DOCTYPE_AFTER_TAGS:
+     case DTYPE_NOT_UPPER_CASE:
+-        messageNode(doc, TidyWarning, rpt, fmt);
++        messageNode(doc, TidyWarning, rpt, "%s", fmt);
+         break;
+ 
+     case COERCE_TO_ENDTAG:
+@@ -1499,7 +1499,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+     case ENCODING_IO_CONFLICT:
+     case MISSING_DOCTYPE:
+     case SPACE_PRECEDING_XMLDECL:
+-        messageNode(doc, TidyWarning, node, fmt);
++        messageNode(doc, TidyWarning, node, "%s", fmt);
+         break;
+ 
+     case TRIM_EMPTY_ELEMENT:
+@@ -1548,7 +1548,7 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
+     {
+     case SUSPECTED_MISSING_QUOTE:
+     case DUPLICATE_FRAMESET:
+-        messageNode(doc, TidyError, rpt, fmt);
++        messageNode(doc, TidyError, rpt, "%s", fmt);
+         break;
+ 
+     case UNKNOWN_ELEMENT:
diff --git a/tidy.spec b/tidy.spec
index 2360ef3..21f48a4 100644
--- a/tidy.spec
+++ b/tidy.spec
@@ -6,7 +6,7 @@
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 30.%{snap}%{?dist}
+Release: 31.%{snap}%{?dist}
 
 Group:   Applications/Text
 License: W3C
@@ -17,6 +17,8 @@ Source0: tidy-%{snap}cvs.tar.gz
 Source1: tab2space.1
 Source10: tidy-cvs_checkout.sh
 
+Patch0: tidy-20091203cvs-format.patch
+
 BuildRequires: libtool
 BuildRequires: doxygen
 BuildRequires: libxslt
@@ -51,6 +53,7 @@ Requires: %{libname}%{?_isa} = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .format
 
 # htmldocs included in cvs checkout
 #setup -q -n %{name} -T -D -b1
@@ -124,6 +127,9 @@ mv testone.sh{~,}
 
 
 %changelog
+* Tue Dec 03 2013 Pavel Raiskup <praiskup at redhat.com> - 0.99.0-31.20091203
+- silence gcc's warnings for -Werror=format-string (#1037356)
+
 * Thu Oct 10 2013 Pavel Raiskup <praiskup at redhat.com> - 0.99.0-30.20091203
 - enable testsuite during package build
 


More information about the scm-commits mailing list