[doris] 09/14: New debian/patches/0005-fix-comparison-between-pointer-and-integer.patch

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository doris.

commit 58437e10bb4558788ecad6e1f046d6b1f7245b17
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Aug 7 06:34:21 2017 +0000

    New debian/patches/0005-fix-comparison-between-pointer-and-integer.patch
---
 debian/changelog                                    |  1 +
 ...fix-comparison-between-pointer-and-integer.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2bc803a..f74d51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ doris (5.0.3~beta+dfsg-1) UNRELEASED; urgency=medium
   * debiam/patches
     - drop 0005-compatibility-with-gcc-4.8.x.patch (applied upstream)
     - refresh remaining patches
+    - new 0005-fix-comparison-between-pointer-and-integer.patch
   * debiam/rules
     - update to new directory layout
     - dropped get-orig-source target (implemented via uscan)
diff --git a/debian/patches/0005-fix-comparison-between-pointer-and-integer.patch b/debian/patches/0005-fix-comparison-between-pointer-and-integer.patch
new file mode 100644
index 0000000..6577178
--- /dev/null
+++ b/debian/patches/0005-fix-comparison-between-pointer-and-integer.patch
@@ -0,0 +1,21 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 7 Aug 2017 06:32:29 +0000
+Subject: fix comparison between pointer and integer
+
+---
+ sar_tools/cpxfiddle.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sar_tools/cpxfiddle.cc b/sar_tools/cpxfiddle.cc
+index 3e44c25..32bfc31 100644
+--- a/sar_tools/cpxfiddle.cc
++++ b/sar_tools/cpxfiddle.cc
+@@ -1854,7 +1854,7 @@ static struct option const long_options[] =
+   // filename: last argument
+   // cerr << "OPTARG: " << argv[argc-1] << endl;
+   // cerr << "OPTARG: " << argv[optind] << endl;
+-  if (argv[optind]=='\0')
++  if (argv[optind]==0 || argv[optind][0]=='\0')
+     {
+     cerr << argv[0] << ": ERROR: No input file specified.\n";
+     return false;
diff --git a/debian/patches/series b/debian/patches/series
index b47f13a..505268d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-configure.patch
 0003-tools-build.patch
 0004-csh-path.patch
+0005-fix-comparison-between-pointer-and-integer.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/doris.git