[doris] 10/14: Fix invalid conversion from 'char' to 'const char*'

[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 a09f94b5e66961435bc27fb62ca5d9476411f8a1
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Aug 7 07:17:07 2017 +0000

    Fix invalid conversion from 'char' to 'const char*'
---
 debian/changelog                                     |  2 +-
 ...ointer-and-integer.patch => 0005-fix-build.patch} | 20 +++++++++++++++++---
 debian/patches/series                                |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f74d51f..cd5dcc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +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
+    - new 0005-fix-build.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-build.patch
similarity index 53%
rename from debian/patches/0005-fix-comparison-between-pointer-and-integer.patch
rename to debian/patches/0005-fix-build.patch
index 6577178..42080a5 100644
--- a/debian/patches/0005-fix-comparison-between-pointer-and-integer.patch
+++ b/debian/patches/0005-fix-build.patch
@@ -1,11 +1,25 @@
 From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 7 Aug 2017 06:32:29 +0000
-Subject: fix comparison between pointer and integer
+Subject: fix build
 
 ---
- sar_tools/cpxfiddle.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ doris_core/bk_messages.hh | 2 +-
+ sar_tools/cpxfiddle.cc    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/doris_core/bk_messages.hh b/doris_core/bk_messages.hh
+index 0644f8e..7e0368e 100755
+--- a/doris_core/bk_messages.hh
++++ b/doris_core/bk_messages.hh
+@@ -211,7 +211,7 @@ class bk_messages
+       if (strlen(id)>=10)
+         {
+         strncpy(name_,id, 9);
+-        strcat(name_,'\0');// terminate id
++        name_[9] = '\0';// terminate id
+         }
+       else
+         {
 diff --git a/sar_tools/cpxfiddle.cc b/sar_tools/cpxfiddle.cc
 index 3e44c25..32bfc31 100644
 --- a/sar_tools/cpxfiddle.cc
diff --git a/debian/patches/series b/debian/patches/series
index 505268d..f06cfa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
 0002-configure.patch
 0003-tools-build.patch
 0004-csh-path.patch
-0005-fix-comparison-between-pointer-and-integer.patch
+0005-fix-build.patch

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