[med-svn] [conquest-dicom-server] 04/04: Refresh patches
Pablo Lorenzzoni
spectra at moszumanska.debian.org
Wed Mar 19 20:46:01 UTC 2014
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 ceee4c78c2fcd5e5770b0588153a4db8e8f1716f
Author: Pablo Lorenzzoni <spectra at debian.org>
Date: Wed Mar 19 17:33:25 2014 -0300
Refresh patches
---
debian/changelog | 4 +-
...te-option-and-description-in-PrintOptions.patch | 35 +++-----
.../0006-Add-DebianBaseDir-at-dgate.cpp.patch | 6 +-
debian/patches/0008-Fix-cppcheck-bug-1.patch | 22 -----
...8-Fix-mismatched-new-delete-in-dbsql.cpp.patch} | 4 +-
debian/patches/0009-Fix-cppcheck-bug-4.patch | 23 -----
...009-Fix-mismatched-new-delete-in-rtc.cxx.patch} | 0
debian/patches/0010-Fix-cppcheck-bug-5.5.patch | 22 -----
...-Fix-mismatched-new-delete-in-farray.thh.patch} | 0
...-Fix-mismatched-new-delete-in-device.cpp.patch} | 6 +-
...-Patch-mismatches-new-delete-in-flpdu.cxx.patch | 97 ----------------------
...-cppcheck-bugs-8-and-9-Reviewed-by-Marcel.patch | 30 -------
...-Fix-mismatched-new-delete-in-buffer.cxx.patch} | 4 +-
...013-Fix-cppcheck-bug-3-Reviewed-by-Marcel.patch | 29 -------
...014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch | 30 -------
debian/patches/series | 17 ++--
16 files changed, 28 insertions(+), 301 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1395eec..fd30bf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-conquest-dicom-server (1.4.17c-2) UNRELEASED; urgency=low
+conquest-dicom-server (1.4.17d-1) UNRELEASED; urgency=low
[ Mathieu Malaterre ]
* Debianization
@@ -7,4 +7,4 @@ conquest-dicom-server (1.4.17c-2) UNRELEASED; urgency=low
* New Maintainer
* Initial release (Closes: #680352)
- -- Pablo Lorenzzoni <spectra at debian.org> Fri, 24 Jan 2014 22:34:29 -0200
+ -- Pablo Lorenzzoni <spectra at debian.org> Wed, 19 Mar 2014 17:16:48 -0300
diff --git a/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch b/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch
index 394abc8..7548c34 100644
--- a/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch
+++ b/debian/patches/0005-Separate-option-and-description-in-PrintOptions.patch
@@ -3,14 +3,14 @@ Date: Sat, 1 Feb 2014 15:03:04 +0000
Subject: Separate option and description in PrintOptions
---
- dgate.cpp | 64 ++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 32 insertions(+), 32 deletions(-)
+ dgate.cpp | 58 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/dgate.cpp b/dgate.cpp
-index 20c6e3f..61bba6f 100644
+index 99e5f70..ad7768d 100644
--- a/dgate.cpp
+++ b/dgate.cpp
-@@ -11174,10 +11174,10 @@ PrintOptions ()
+@@ -11258,10 +11258,10 @@ PrintOptions ()
fprintf(stderr, " [-i|-r|-arDEVICE] Init|Init/regenerate DB|Regen single device\n");
fprintf(stderr, " [-d|-m|-k] List (-d) devices (-m) AE map (-k) DICOM.SQL\n");
fprintf(stderr, " [-t|-o] Test console|Test database\n");
@@ -24,7 +24,7 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, " [-au|-aeFROM,TO] Undo select for archiving|rename device\n");
fprintf(stderr, " [-av|-atDEVICE] Verify mirror disk|Test read files for DEVICE\n");
fprintf(stderr, " [-abJUKEBOX1.2,N] Make cacheset to burn JUKEBOX1,CD2 from MAGN\n");
-@@ -11188,7 +11188,7 @@ PrintOptions ()
+@@ -11272,7 +11272,7 @@ PrintOptions ()
fprintf(stderr, " [-faFILE<,ID>] Add file to server<optionally change PATID>\n");
fprintf(stderr, " [-zID] Delete (zap) patient\n");
fprintf(stderr, " [-frDEVICE,DIR] Regen single directory DIR on DEVICE\n");
@@ -33,7 +33,7 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, " [-f?file|-fu|-c#] get UID of file|Make new UID|UID helper(0..99)\n");
fprintf(stderr, " [-ff#] Delete old patients until #MB free\n");
fprintf(stderr, " [-gSERVER,DATE] grab images from SERVER of date not on here\n");
-@@ -11213,14 +11213,14 @@ PrintOptions ()
+@@ -11297,14 +11297,14 @@ PrintOptions ()
fprintf(stderr, " --movestudy:source,dest,patid:studyuid Move study, patid: optional\n" );
fprintf(stderr, " --moveaccession:source,dest,patid:acc Move by Accession#, patid: optional\n" );
fprintf(stderr, " --movestudies:source,dest,date(range) Move studies on date\n" );
@@ -52,7 +52,7 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, " --mergestudy:uid,uid,.. Start merging studies with given studyuids\n" );
fprintf(stderr, " --mergestudyfile:file Use to process all files to merge\n" );
fprintf(stderr, " --mergeseries:uid,uid,.. Start merging series with given seriesuids\n" );
-@@ -11228,7 +11228,7 @@ PrintOptions ()
+@@ -11312,7 +11312,7 @@ PrintOptions ()
fprintf(stderr, " --attachanytopatient:any,sample Modify uids to attach any object to\n" );
fprintf(stderr, " --attachanytostudy:any,sample patient|study|series in sample file\n" );
fprintf(stderr, " --attachanytoseries:any,sample Do not attach same at different levels\n" );
@@ -61,7 +61,7 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, "\n");
fprintf(stderr, "Maintenance options:\n");
fprintf(stderr, " --initializetables: Clear and create database\n" );
-@@ -11263,27 +11263,27 @@ PrintOptions ()
+@@ -11347,27 +11347,27 @@ PrintOptions ()
fprintf(stderr, " --read_ini: Re-read all parameters from DICOM.INI\n" );
fprintf(stderr, " --get_amap:index,fmt List any entry from ACRNEMA.MAP\n" );
fprintf(stderr, " --get_amaps:fmt List all entries from ACRNEMA.MAP\n" );
@@ -97,7 +97,7 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, "\n");
fprintf(stderr, "Communication options:\n");
fprintf(stderr, " --addimagefile:file,patid Copy file into server, optionally new patid\n" );
-@@ -11292,12 +11292,12 @@ PrintOptions ()
+@@ -11376,12 +11376,12 @@ PrintOptions ()
fprintf(stderr, " --loadhl7:file Load HL7 data into worklist\n" );
fprintf(stderr, " --dump_header:filein,fileout Create header dump of file\n" );
fprintf(stderr, " --forward:file,mode,server Send file with compr. mode to server\n");
@@ -114,7 +114,7 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, " --scheduletransfer:options Background sftp transfer as above\n" );
fprintf(stderr, "\n");
fprintf(stderr, "Test options:\n");
-@@ -11309,24 +11309,24 @@ PrintOptions ()
+@@ -11393,25 +11393,25 @@ PrintOptions ()
fprintf(stderr, " --clonedb:AE Clone db from server for testing\n" );
fprintf(stderr, "\n");
fprintf(stderr, "Conversion options:\n");
@@ -130,6 +130,7 @@ index 20c6e3f..61bba6f 100644
+ fprintf(stderr, " --extract_frames:file,out,first,last Select frames of DICOM file\n");
fprintf(stderr, " --count_frames:file report # frames in DICOM file\n");
fprintf(stderr, " --uncompress:file,out Uncompress DICOM\n");
+ fprintf(stderr, " --compress:file,mode,out Compress DICOM to mode e.g. J2\n");
fprintf(stderr, " --wadorequest:parameters Internal WADO server\n");
fprintf(stderr, "\n");
fprintf(stderr, "Database options:\n");
@@ -147,17 +148,3 @@ index 20c6e3f..61bba6f 100644
fprintf(stderr, " --extract:PatientID = 'id' Extract all dbase tables to X..\n" );
fprintf(stderr, " --extract: Extract patient dbase table to XA..\n" );
fprintf(stderr, " --addrecord:table|flds|values Append record, values must be in ''\n" );
-@@ -11342,10 +11342,10 @@ PrintOptions ()
- fprintf(stderr, " --movedatatodevice:to,from Move patients from one device to another\n" );
- fprintf(stderr, " --moveseriestodevice:to,from Move series from one device to another\n" );
- fprintf(stderr, " --selectlruforarchival:kb,device Step 1 for archival: to device.Archival\n" );
-- fprintf(stderr, " --selectseriestomove:device,age,kb Step 1 for archival: to device.Archival\n" );
-+ fprintf(stderr, " --selectseriestomove:device,age,kb Step 1 for archival: to device.Archival\n" );
- fprintf(stderr, " --preparebunchforburning:to,from Step 2 for archival: moves to cache\n" );
-- fprintf(stderr, " --deletebunchafterburning:deviceto Step 3 for archival: deletes from cache\n" );
-- fprintf(stderr, " --comparebunchafterburning:deviceto Part step 3 - compare jukebox to cache\n" );
-+ fprintf(stderr, " --deletebunchafterburning:deviceto Step 3 for archival: deletes from cache\n" );
-+ fprintf(stderr, " --comparebunchafterburning:deviceto Part step 3 - compare jukebox to cache\n" );
- fprintf(stderr, " --restoremagflags: Undo archival sofar\n" );
- fprintf(stderr, "\n");
- fprintf(stderr, "Scripting options:\n");
diff --git a/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch b/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
index 8f90f0a..2e6d2fe 100644
--- a/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
+++ b/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
@@ -7,10 +7,10 @@ Subject: Add DebianBaseDir at dgate.cpp
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/dgate.cpp b/dgate.cpp
-index 61bba6f..cc440aa 100644
+index ad7768d..30581d1 100644
--- a/dgate.cpp
+++ b/dgate.cpp
-@@ -1108,6 +1108,8 @@ char RootConfig[64] = "sscscp"; // main entry in ini file
+@@ -1119,6 +1119,8 @@ char RootConfig[64] = "sscscp"; // main entry in ini file
// Later make everything MAX_PATH or similar?
char BaseDir[256] = ""; // where the files are
@@ -19,7 +19,7 @@ index 61bba6f..cc440aa 100644
#ifndef UNIX
char ConfigFile[256] = ".\\dicom.ini"; // name ini file
char DicomDict[256] = ".\\dgate.dic"; // name dicomdictionary file
-@@ -21109,16 +21111,12 @@ main ( int argc, char *argv[] )
+@@ -21220,16 +21222,12 @@ main ( int argc, char *argv[] )
}
}
diff --git a/debian/patches/0008-Fix-cppcheck-bug-1.patch b/debian/patches/0008-Fix-cppcheck-bug-1.patch
deleted file mode 100644
index 124d6ba..0000000
--- a/debian/patches/0008-Fix-cppcheck-bug-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Pablo Lorenzzoni <spectra at debian.org>
-Date: Wed, 5 Feb 2014 10:57:52 +0000
-Subject: Fix cppcheck bug #1
-
-[buffer.cxx:440]: (error) Mismatching allocation and deallocation: Data
----
- buffer.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buffer.cxx b/buffer.cxx
-index 08130e0..ce69aa2 100644
---- a/buffer.cxx
-+++ b/buffer.cxx
-@@ -437,7 +437,7 @@ BOOL Buffer :: Kill(UINT Bytes)
- if (!Data) DicomError(DCM_ERROR_MEMORY, "Bufferspace: out of memory allocating %d bytes\n", Bytes+1);
-
- Ret = Read(Data, Bytes);
-- delete Data;
-+ delete [] Data;
- return ( Ret );
- }
-
diff --git a/debian/patches/0015-Fix-mismatched-new-delete-in-dbsql.cpp.patch b/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
similarity index 81%
rename from debian/patches/0015-Fix-mismatched-new-delete-in-dbsql.cpp.patch
rename to debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
index 05c902f..675a2f7 100644
--- a/debian/patches/0015-Fix-mismatched-new-delete-in-dbsql.cpp.patch
+++ b/debian/patches/0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
@@ -7,10 +7,10 @@ Subject: Fix mismatched new/delete in dbsql.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dbsql.cpp b/dbsql.cpp
-index e364c13..2001d44 100644
+index 5240a40..e31249a 100644
--- a/dbsql.cpp
+++ b/dbsql.cpp
-@@ -2283,7 +2283,7 @@ MakeSafeStringValues (
+@@ -2309,7 +2309,7 @@ MakeSafeStringValues (
(*sout) = '\'';++sout;
(*sout) = '\0';
diff --git a/debian/patches/0009-Fix-cppcheck-bug-4.patch b/debian/patches/0009-Fix-cppcheck-bug-4.patch
deleted file mode 100644
index e5d999e..0000000
--- a/debian/patches/0009-Fix-cppcheck-bug-4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Pablo Lorenzzoni <spectra at debian.org>
-Date: Wed, 5 Feb 2014 14:36:36 +0000
-Subject: Fix cppcheck bug #4
-
-[device.cpp:786]: (error) Dangerous usage of 's' (strncpy doesn't always 0-terminate it)
----
- device.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/device.cpp b/device.cpp
-index 02cf3cd..d128c04 100644
---- a/device.cpp
-+++ b/device.cpp
-@@ -781,7 +781,8 @@ CheckFreeStoreOnCACHEDevice(
-
- if (CACHENumber >= CACHEDevices || CACHENumber < 0) return 0;
-
-- strncpy(s, CACHEDeviceTable[CACHENumber], 1023);
-+ strncpy(s, CACHEDeviceTable[CACHENumber], 1023);
-+ s[1023] = '\0';
-
- if ((chp = strchr(s, '%')))
- {
diff --git a/debian/patches/0016-Fix-mismatched-new-delete-in-rtc.cxx.patch b/debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch
similarity index 100%
rename from debian/patches/0016-Fix-mismatched-new-delete-in-rtc.cxx.patch
rename to debian/patches/0009-Fix-mismatched-new-delete-in-rtc.cxx.patch
diff --git a/debian/patches/0010-Fix-cppcheck-bug-5.5.patch b/debian/patches/0010-Fix-cppcheck-bug-5.5.patch
deleted file mode 100644
index 41faee3..0000000
--- a/debian/patches/0010-Fix-cppcheck-bug-5.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Pablo Lorenzzoni <spectra at debian.org>
-Date: Wed, 5 Feb 2014 16:37:14 -0200
-Subject: Fix cppcheck bug #5.5
-
-[dgate.cpp:6504]: (error) printf format string has 1 parameters but only 0 are given
----
- dgate.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dgate.cpp b/dgate.cpp
-index cc440aa..7aca6a0 100644
---- a/dgate.cpp
-+++ b/dgate.cpp
-@@ -6503,7 +6503,7 @@ extern "C"
- DICOMDataObject *P = MakeCopy(O);
- int rc = SaveToDisk(DB, P, rFilename, TRUE, &PDU, 0, TRUE);
- if (!rc)
-- { OperatorConsole.printf("***[lua addimage] Error entering object into server%s\n");
-+ { OperatorConsole.printf("***[lua addimage] Error entering object into server%s\n", DataHost);
- }
- else
- { if (rc==2) OperatorConsole.printf("Lua script rewritten file: %s\n", rFilename);
diff --git a/debian/patches/0017-Fix-mismatched-new-delete-in-farray.thh.patch b/debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch
similarity index 100%
rename from debian/patches/0017-Fix-mismatched-new-delete-in-farray.thh.patch
rename to debian/patches/0010-Fix-mismatched-new-delete-in-farray.thh.patch
diff --git a/debian/patches/0018-Fix-mismatched-new-delete-in-device.cpp.patch b/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch
similarity index 87%
rename from debian/patches/0018-Fix-mismatched-new-delete-in-device.cpp.patch
rename to debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch
index 065c396..6b7ee4e 100644
--- a/debian/patches/0018-Fix-mismatched-new-delete-in-device.cpp.patch
+++ b/debian/patches/0011-Fix-mismatched-new-delete-in-device.cpp.patch
@@ -7,10 +7,10 @@ Subject: Fix mismatched new/delete in device.cpp
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/device.cpp b/device.cpp
-index 0d4458f..d2f7eaa 100644
+index 9022481..b59f02e 100644
--- a/device.cpp
+++ b/device.cpp
-@@ -185,12 +185,12 @@ void FreeDeviceTables(void)
+@@ -189,12 +189,12 @@ void FreeDeviceTables(void)
{ int i;
for (i=0; i<(int)MAGDevices; i++)
@@ -27,7 +27,7 @@ index 0d4458f..d2f7eaa 100644
for (i=0; i<(int)MOPDevices; i++)
delete MOPDeviceTable[i];
-@@ -201,16 +201,16 @@ void FreeDeviceTables(void)
+@@ -205,16 +205,16 @@ void FreeDeviceTables(void)
delete CDRDeviceTable;
for (i=0; i<(int)CACHEDevices; i++)
diff --git a/debian/patches/0011-Patch-mismatches-new-delete-in-flpdu.cxx.patch b/debian/patches/0011-Patch-mismatches-new-delete-in-flpdu.cxx.patch
deleted file mode 100644
index 06dceeb..0000000
--- a/debian/patches/0011-Patch-mismatches-new-delete-in-flpdu.cxx.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From: Pablo Lorenzzoni <spectra at debian.org>
-Date: Wed, 12 Feb 2014 15:48:27 -0200
-Subject: Patch mismatches new/delete in flpdu.cxx
-
----
- flpdu.cxx | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/flpdu.cxx b/flpdu.cxx
-index 0af7b5e..7d9dda7 100644
---- a/flpdu.cxx
-+++ b/flpdu.cxx
-@@ -456,12 +456,12 @@ CheckedPDU_Service :: ReleaseMemory ()
- Index = 0;
- while ( Index < SOPUIDListCount )
- {
-- delete SOPUIDList [ Index ] ;
-- delete SOPUIDListNames [ Index ] ;
-+ delete [] SOPUIDList [ Index ] ;
-+ delete [] SOPUIDListNames [ Index ] ;
- ++Index;
- }
-- delete SOPUIDList;
-- delete SOPUIDListNames;
-+ delete [] SOPUIDList;
-+ delete [] SOPUIDListNames;
- SOPUIDList = NULL;
- SOPUIDListNames = NULL;
- SOPUIDListCount = 0;
-@@ -472,12 +472,12 @@ CheckedPDU_Service :: ReleaseMemory ()
- Index = 0;
- while ( Index < TransferUIDListCount )
- {
-- delete TransferUIDList [ Index ] ;
-- delete TransferUIDListNames [ Index ] ;
-+ delete [] TransferUIDList [ Index ] ;
-+ delete [] TransferUIDListNames [ Index ] ;
- ++Index;
- }
-- delete TransferUIDList;
-- delete TransferUIDListNames;
-+ delete [] TransferUIDList;
-+ delete [] TransferUIDListNames;
- TransferUIDList = NULL;
- TransferUIDListNames = NULL;
- TransferUIDListCount = 0;
-@@ -488,12 +488,12 @@ CheckedPDU_Service :: ReleaseMemory ()
- Index = 0;
- while ( Index < ApplicationUIDListCount )
- {
-- delete ApplicationUIDList [ Index ] ;
-- delete ApplicationUIDListNames [ Index ] ;
-+ delete [] ApplicationUIDList [ Index ] ;
-+ delete [] ApplicationUIDListNames [ Index ] ;
- ++Index;
- }
-- delete ApplicationUIDList;
-- delete ApplicationUIDListNames;
-+ delete [] ApplicationUIDList;
-+ delete [] ApplicationUIDListNames;
- ApplicationUIDList = NULL;
- ApplicationUIDListNames = NULL;
- ApplicationUIDListCount = 0;
-@@ -503,12 +503,12 @@ CheckedPDU_Service :: ReleaseMemory ()
- Index = 0;
- while ( Index < RemoteAEListCount )
- {
-- delete RemoteAEList [ Index ] ;
-- delete RemoteAEListNames [ Index ] ;
-+ delete [] RemoteAEList [ Index ] ;
-+ delete [] RemoteAEListNames [ Index ] ;
- ++Index;
- }
-- delete RemoteAEList;
-- delete RemoteAEListNames;
-+ delete [] RemoteAEList;
-+ delete [] RemoteAEListNames;
- RemoteAEList = NULL;
- RemoteAEListNames = NULL;
- RemoteAEListCount = 0;
-@@ -518,12 +518,12 @@ CheckedPDU_Service :: ReleaseMemory ()
- Index = 0;
- while ( Index < LocalAEListCount )
- {
-- delete LocalAEList [ Index ] ;
-- delete LocalAEListNames [ Index ] ;
-+ delete [] LocalAEList [ Index ] ;
-+ delete [] LocalAEListNames [ Index ] ;
- ++Index;
- }
-- delete LocalAEList;
-- delete LocalAEListNames;
-+ delete [] LocalAEList;
-+ delete [] LocalAEListNames;
- LocalAEList = NULL;
- LocalAEListNames = NULL;
- LocalAEListCount = 0;
diff --git a/debian/patches/0012-Fix-cppcheck-bugs-8-and-9-Reviewed-by-Marcel.patch b/debian/patches/0012-Fix-cppcheck-bugs-8-and-9-Reviewed-by-Marcel.patch
deleted file mode 100644
index 46e84c1..0000000
--- a/debian/patches/0012-Fix-cppcheck-bugs-8-and-9-Reviewed-by-Marcel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Pablo Lorenzzoni <spectra at debian.org>
-Date: Wed, 5 Mar 2014 17:35:22 -0300
-Subject: Fix cppcheck bugs 8 and 9 - Reviewed by Marcel
-
----
- dgate.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dgate.cpp b/dgate.cpp
-index 7aca6a0..6a8c109 100644
---- a/dgate.cpp
-+++ b/dgate.cpp
-@@ -5976,7 +5976,7 @@ extern "C"
- }
- static int luasql(lua_State *L)
- { const char *sql = lua_tostring(L,1);
-- BOOL f;
-+ BOOL f = FALSE;
-
- Database DB;
- if (DB.Open ( DataSource, UserName, Password, DataHost ) )
-@@ -6410,7 +6410,7 @@ extern "C"
- static int luadeletedicomobject(lua_State *L)
- { struct scriptdata *sd = getsd(L);
- DICOMDataObject *O = NULL;
-- int owned;
-+ int owned = 0;
- Array < DICOMDataObject * > *A = NULL;
- if (lua_isuserdata(L,1))
- { lua_getmetatable(L, 1);
diff --git a/debian/patches/0019-Fix-mismatched-new-delete-in-buffer.cxx.patch b/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
similarity index 80%
rename from debian/patches/0019-Fix-mismatched-new-delete-in-buffer.cxx.patch
rename to debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
index 3f7f32a..16042bf 100644
--- a/debian/patches/0019-Fix-mismatched-new-delete-in-buffer.cxx.patch
+++ b/debian/patches/0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
@@ -7,10 +7,10 @@ Subject: Fix mismatched new/delete in buffer.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buffer.cxx b/buffer.cxx
-index ce69aa2..ebbc454 100644
+index eeb4d69..b6b1842 100644
--- a/buffer.cxx
+++ b/buffer.cxx
-@@ -101,7 +101,7 @@ BufferSpace :: ~BufferSpace()
+@@ -102,7 +102,7 @@ BufferSpace :: ~BufferSpace()
{
if ( !isTemp )
if ( Data )
diff --git a/debian/patches/0013-Fix-cppcheck-bug-3-Reviewed-by-Marcel.patch b/debian/patches/0013-Fix-cppcheck-bug-3-Reviewed-by-Marcel.patch
deleted file mode 100644
index dbd6f48..0000000
--- a/debian/patches/0013-Fix-cppcheck-bug-3-Reviewed-by-Marcel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Pablo Lorenzzoni <spectra at debian.org>
-Date: Wed, 5 Mar 2014 17:42:32 -0300
-Subject: Fix cppcheck bug 3 - Reviewed by Marcel
-
----
- device.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/device.cpp b/device.cpp
-index d128c04..0d4458f 100644
---- a/device.cpp
-+++ b/device.cpp
-@@ -2895,10 +2895,16 @@ MakeListOfPatientsOnDevice(char *Device, char **PatientIDList)
- if (PatList==NULL) return -1;
-
- if (!DB.QueryDistinct(PatientTableName, "PatientID", "", "DICOMPatients.AccessTime"))
-+ {
-+ free(PatList);
- return -1;
-+ }
-
- if(!DB.BindField (1, SQL_C_CHAR, PatientID, 68, &sdword))
-+ {
-+ free(PatList);
- return -1;
-+ }
-
- NPat = 0;
- while(DB.NextRecord())
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
deleted file mode 100644
index 8f0e167..0000000
--- a/debian/patches/0014-Fix-cppcheck-bug-6-Reviewed-by-Marcel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 da379f5..dc7b7c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,15 +5,8 @@
0005-Separate-option-and-description-in-PrintOptions.patch
0006-Add-DebianBaseDir-at-dgate.cpp.patch
0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
-0008-Fix-cppcheck-bug-1.patch
-0009-Fix-cppcheck-bug-4.patch
-0010-Fix-cppcheck-bug-5.5.patch
-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
-0015-Fix-mismatched-new-delete-in-dbsql.cpp.patch
-0016-Fix-mismatched-new-delete-in-rtc.cxx.patch
-0017-Fix-mismatched-new-delete-in-farray.thh.patch
-0018-Fix-mismatched-new-delete-in-device.cpp.patch
-0019-Fix-mismatched-new-delete-in-buffer.cxx.patch
+0008-Fix-mismatched-new-delete-in-dbsql.cpp.patch
+0009-Fix-mismatched-new-delete-in-rtc.cxx.patch
+0010-Fix-mismatched-new-delete-in-farray.thh.patch
+0011-Fix-mismatched-new-delete-in-device.cpp.patch
+0012-Fix-mismatched-new-delete-in-buffer.cxx.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git
More information about the debian-med-commit
mailing list