suppress additional output when disabling warning 18

diff --git a/debian/changelog b/debian/changelog
index 64d388542e8806b233371479bdbe24891156ca62..1dc7920740472befe4d99cde872c17eb523f32c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cc1111 (2.9.0-6) unstable; urgency=low
+
+  * patch from Eric Cooper to suppress additional output when disabling
+    warning 18, closes: #784273
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 08 May 2015 12:24:54 -0600
+
 cc1111 (2.9.0-5) unstable; urgency=low
 
   * add mcs51 assembler symlink for compatibility with recent versions

diff --git a/debian/patches/series b/debian/patches/series
index cab72df90b8d7781cd54d6ba134282d47ab5c4b1..99eef02ace1446ad749bec1ccf3735a89bfb0ed3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04_libtool_fix
 05_fix_format_not_a_string_literal
 updated_makebin
+suppress-additional-output-when-disabling-warning-18

diff --git a/debian/patches/suppress-additional-output-when-disabling-warning-18 b/debian/patches/suppress-additional-output-when-disabling-warning-18
new file mode 100644 (file)
index 0000000..a2ef665
--- /dev/null
+++ b/debian/patches/suppress-additional-output-when-disabling-warning-18
@@ -0,0 +1,37 @@
+From 0ac4b0e0021c0664e12fa060ffdf59c7ebd0e679 Mon Sep 17 00:00:00 2001
+From: Eric Cooper <ecc@cmu.edu>
+Date: Fri, 8 May 2015 12:32:53 -0400
+Subject: [PATCH] suppress additional output when disabling warning 18
+
+Signed-off-by: Eric Cooper <ecc@cmu.edu>
+---
+ src/SDCCglue.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/SDCCglue.c b/src/SDCCglue.c
+index f753441..46c1ead 100644
+--- a/src/SDCCglue.c
++++ b/src/SDCCglue.c
+@@ -352,7 +352,8 @@ initPointer (initList * ilist, sym_link *toType)
+       IS_AST_OP(expr->right) && expr->right->opval.op=='&') {
+     if (compareType(toType, expr->left->ftype)!=1) {
+       werror (W_INIT_WRONG);
+-      printFromToType(expr->left->ftype, toType);
++      if (!_SDCCERRG.disabled[W_INIT_WRONG])
++          printFromToType(expr->left->ftype, toType);
+     }
+     // skip the cast ???
+     expr=expr->right;
+@@ -1075,7 +1076,8 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s * o
+   /* check the type      */
+   if (compareType (type, val->type) == 0) {
+     werrorfl (ilist->filename, ilist->lineno, W_INIT_WRONG);
+-    printFromToType (val->type, type);
++    if (!_SDCCERRG.disabled[W_INIT_WRONG])
++        printFromToType (val->type, type);
+   }
+ 
+   /* if val is literal */
+-- 
+2.1.4
+