[med-svn] r15145 - trunk/packages/ctn/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2013-11-07 21:25:29 +0000 (Thu, 07 Nov 2013)
New Revision: 15145

Modified:
   trunk/packages/ctn/trunk/debian/patches/30_hardening.patch
Log:
More format issues


Modified: trunk/packages/ctn/trunk/debian/patches/30_hardening.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/30_hardening.patch	2013-11-07 21:11:29 UTC (rev 15144)
+++ trunk/packages/ctn/trunk/debian/patches/30_hardening.patch	2013-11-07 21:25:29 UTC (rev 15145)
@@ -1,6 +1,6 @@
---- a/facilities/database/database.c
-+++ b/facilities/database/database.c
-@@ -865,7 +865,7 @@ DB_DumpDB(short dbid)
+--- ctn-3.2.0+dfsg.orig.orig/facilities/database/database.c
++++ ctn-3.2.0+dfsg.orig/facilities/database/database.c
+@@ -865,7 +865,7 @@
      if (HF_SharedLock() != HF_NORMAL)
  	return;
  
@@ -9,7 +9,7 @@
  	   GS_root.dbkey, GS_root.num_patients, HF_ReadUpdateFlag());
  
      for (i = 0; i < DB_MAXPATIENTS; i++) {
-@@ -947,7 +947,7 @@ DB_PrintSeries(SeriesNode *snode)
+@@ -947,7 +947,7 @@
      printf("\t\t     Modality: %s\n", snode->series.Modality);
      printf("\t\tSeries Number: %s\n", snode->series.SeriesNumber);
      printf("\t\t   Series UID: %s\n", snode->series.SeriesUID);
@@ -18,7 +18,7 @@
  }
  /* DB_PrintStudy
  **
-@@ -981,7 +981,7 @@ DB_PrintStudy(StudyNode *snode)
+@@ -981,7 +981,7 @@
      printf("\t\t          InterpretingPhysName: %s\n", snode->study.InterpretingPhysName);
      printf("\t\t          ProcedureDescription: %s\n", snode->study.ProcedureDescription);
      printf("\t\t AdmittingDiagnosedDescription: %s\n", snode->study.AdmittingDiagnosedDescription);
@@ -27,7 +27,7 @@
  }
  /* DB_PrintPatient
  **
-@@ -1007,7 +1007,7 @@ DB_PrintPatient(PatientNode pnode)
+@@ -1007,7 +1007,7 @@
      printf("\tBirthdate: %s\n", pnode.pat.BirthDate);
      printf("\t     Name: %s\n", pnode.pat.Name);
      printf("\t    PatID: %s\n", pnode.pat.PatID);
@@ -36,7 +36,7 @@
  }
  
  /* DB_PrintImage
-@@ -1035,7 +1035,7 @@ DB_PrintImage(ImageNode inode)
+@@ -1035,7 +1035,7 @@
      printf("\t  ImageUID: %s\n", inode.image.ImageUID);
      printf("\t Class UID: %s\n", inode.image.ClassUID);
      printf("\t  FileName: %s\n", inode.image.FileName);
@@ -45,9 +45,9 @@
  }
  
  /* DB_AddSeries
---- a/facilities/objects/dcm.c
-+++ b/facilities/objects/dcm.c
-@@ -1649,7 +1649,7 @@ DCM_DumpElements(DCM_OBJECT ** callerObj
+--- ctn-3.2.0+dfsg.orig.orig/facilities/objects/dcm.c
++++ ctn-3.2.0+dfsg.orig/facilities/objects/dcm.c
+@@ -1649,7 +1649,7 @@
  	(void) LST_Position(&(*object)->groupList, groupItem);
  
      while (groupItem != NULL) {
@@ -56,7 +56,7 @@
  	printf("Group: %04x, Length: %8ld\n", groupItem->group,
  	       groupItem->baseLength);
  #else
-@@ -1660,7 +1660,7 @@ DCM_DumpElements(DCM_OBJECT ** callerObj
+@@ -1660,7 +1660,7 @@
  	if (elementItem != NULL)
  	    (void) LST_Position(&groupItem->elementList, elementItem);
  	while (elementItem != NULL) {
@@ -65,3 +65,45 @@
  	    (void) printf("%04x %04x %8ld ",
  			  DCM_TAG_GROUP(elementItem->element.tag),
  			  DCM_TAG_ELEMENT(elementItem->element.tag),
+--- ctn-3.2.0+dfsg.orig.orig/facilities/services/find.c
++++ ctn-3.2.0+dfsg.orig/facilities/services/find.c
+@@ -569,7 +569,7 @@
+ 		(findResponse->dataSetType == DCM_CMDDATANULL)) {
+ 
+ 		if (PRVSRV_debug)
+-		    fprintf(DEBUG_DEVICE, pendingNullMsg);
++		    fprintf(DEBUG_DEVICE, "%s", pendingNullMsg);
+ 		rtnCond = COND_PushCondition(SRV_SUSPICIOUSRESPONSE,
+ 		   SRV_Message(SRV_SUSPICIOUSRESPONSE), "C-FIND", "pending",
+ 					     "null", "SRV_CFindResponse");
+@@ -578,7 +578,7 @@
+ 		(findResponse->dataSetType != DCM_CMDDATANULL)) {
+ 
+ 		if (PRVSRV_debug)
+-		    fprintf(DEBUG_DEVICE, notPendingnotNullMsg);
++		    fprintf(DEBUG_DEVICE, "%s", notPendingnotNullMsg);
+ 		rtnCond = COND_PushCondition(SRV_SUSPICIOUSRESPONSE,
+ 			      SRV_Message(SRV_SUSPICIOUSRESPONSE), "C-FIND",
+ 			    "not pending", "not null", "SRV_CFindResponse");
+--- ctn-3.2.0+dfsg.orig.orig/facilities/services/get.c
++++ ctn-3.2.0+dfsg.orig/facilities/services/get.c
+@@ -707,7 +707,7 @@
+ 		(getResponse->dataSetType != DCM_CMDDATANULL)) {
+ 
+ 		if (PRVSRV_debug)
+-		    fprintf(DEBUG_DEVICE, pendingMsg);
++		    fprintf(DEBUG_DEVICE, "%s", pendingMsg);
+ 		rtnCond = COND_PushCondition(SRV_SUSPICIOUSRESPONSE,
+ 			       SRV_Message(SRV_SUSPICIOUSRESPONSE), "C-GET",
+ 				 "pending", "not null", "SRV_CGetResponse");
+--- ctn-3.2.0+dfsg.orig.orig/facilities/services/move.c
++++ ctn-3.2.0+dfsg.orig/facilities/services/move.c
+@@ -577,7 +577,7 @@
+ 		(moveResponse->dataSetType != DCM_CMDDATANULL)) {
+ 
+ 		if (PRVSRV_debug)
+-		    fprintf(DEBUG_DEVICE, pendingMsg);
++		    fprintf(DEBUG_DEVICE, "%s", pendingMsg);
+ 		rtnCond = COND_PushCondition(SRV_SUSPICIOUSRESPONSE,
+ 			      SRV_Message(SRV_SUSPICIOUSRESPONSE), "C-MOVE",
+ 				"pending", "not null", "SRV_CFindResponse");