[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-20-ge990c9c

[Peter Pentchev]

The following commit has been merged in the master branch:
commit e990c9cac72fef0a23b87450dc927ad322d86794
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Jan 9 18:12:44 2011 +0200

    Suppress a cppcheck false positive.

diff --git a/debian/changelog b/debian/changelog
index 2af9713..4a010bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ matanza (0.13+ds1-2) experimental; urgency=low
     and LDFLAGS.
   * Bump the debhelper compatibility version to 8 and minimize the rules
     file using the dh(1) helper and debhelper override targets.
+  * Add the 03-cppcheck patch to suppress a cppcheck false positive.
 
- -- Peter Pentchev <roam at ringlet.net>  Sun, 09 Jan 2011 01:43:14 +0200
+ -- Peter Pentchev <roam at ringlet.net>  Sun, 09 Jan 2011 18:12:09 +0200
 
 matanza (0.13+ds1-1) unstable; urgency=low
 
diff --git a/debian/patches/03-cppcheck.patch b/debian/patches/03-cppcheck.patch
new file mode 100644
index 0000000..9b5f410
--- /dev/null
+++ b/debian/patches/03-cppcheck.patch
@@ -0,0 +1,17 @@
+Description: Suppress a cppcheck false positive.
+ The contents of 'buf' is always initialized by the XmlUtf16Encode or
+ the XmlUtf8Encode function, whichever one is invoked.
+Forwarded: no
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2011-01-09
+
+--- a/xmlparse.c
++++ b/xmlparse.c
+@@ -1488,6 +1488,7 @@
+ 	  return XML_ERROR_BAD_CHAR_REF;
+ 	if (characterDataHandler) {
+ 	  XML_Char buf[XML_ENCODE_MAX];
++	  // cppcheck-suppress uninitvar
+ 	  characterDataHandler(handlerArg, buf, XmlEncode(n, (ICHAR *)buf));
+ 	}
+ 	else if (defaultHandler)
diff --git a/debian/patches/series b/debian/patches/series
index 5b91b71..f5ca5f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-fix-verbose-macro.patch
 02-typos.patch
+03-cppcheck.patch

-- 
matanza - a space ascii war game