[med-svn] [conquest-dicom-server] 09/14: Fix cppcheck bug 6 - Reviewed by Marcel

[Pablo Lorenzzoni]

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

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit f62c266bcc3327f7b43b081c659f6b2a6ab7c400
Author: Pablo Lorenzzoni <spectra at debian.org>
Date:   Thu Mar 6 14:55:34 2014 -0300

    Fix cppcheck bug 6 - Reviewed by Marcel
---
 ...014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/0014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch b/debian/patches/0014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch
new file mode 100644
index 0000000..8f0e167
--- /dev/null
+++ b/debian/patches/0014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch
@@ -0,0 +1,30 @@
+From: Pablo Lorenzzoni <spectra at debian.org>
+Date: Thu, 6 Mar 2014 14:54:52 -0300
+Subject: Fix cppcheck bug 6 - Reviewed by Marcel
+
+---
+ dgate.cpp |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/dgate.cpp b/dgate.cpp
+index 6a8c109..9fbd879 100644
+--- a/dgate.cpp
++++ b/dgate.cpp
+@@ -5950,11 +5950,16 @@ extern "C"
+   { unsigned int i, N, flds=1;
+     const char *items[4];
+     SQLLEN SQLResultLength;
++
++    // For reference: https://github.com/spectra/conquest-dicom-server/commit/2c0077af8638682e93787897a3316a2bbba3c7e7#commitcomment-5388219
++    // items[0] is the database name
++    // items[1] is the fields
++    // items[2] is the (optional) query and
++    // items[3] is the optional sort order
+     for (i=0; i<4; i++) items[i]=lua_tostring(L,i+1);
+     if (items[1]) for (i=0; i<strlen(items[1]); i++) if (items[1][i]==',') flds++;
+     if (items[2]) if (*items[2]==0) items[2]=NULL;
+     if (items[3]) if (*items[3]==0) items[3]=NULL;
+-    if (items[4]) if (*items[4]==0) items[4]=NULL;
+ 
+     Database DB;
+     if (DB.Open ( DataSource, UserName, Password, DataHost ) )
diff --git a/debian/patches/series b/debian/patches/series
index 6c0ab68..9ed51b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-Patch-mismatches-new-delete-in-flpdu.cxx.patch
 0012-Fix-cppcheck-bugs-8-and-9-Reviewed-by-Marcel.patch
 0013-Fix-cppcheck-bug-3-Reviewed-by-Marcel.patch
+0014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git