From: Axel Waggershauser <awagger@web.de>

condense gp_log_data debug output.

- changed gp_log_data to take a printf style debug string
  -> new major version of libgphoto2_port
- adjusted all callers



git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15175 67ed7778-7388-44ab-90cf-0a291f65f57c

7 files changed, 29 insertions, 46 deletions

diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index 0bcf6e89a..da9444d4c 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -1686,10 +1686,9 @@ canon_int_set_file_attributes (Camera *camera, const char *file, const char *dir
                 return GP_ERROR_CORRUPTED_DATA;
         }
 
-        gp_log (GP_LOG_DATA, "canon/canon.c",
-                "canon_int_set_file_attributes: returned four bytes as expected, "
-                "we should check if they indicate error or not. Returned data :");
-        gp_log_data ("canon", (char *)msg, 4);
+        GP_LOG_DATA ((char *)msg, 4,
+                     "canon_int_set_file_attributes: returned four bytes as expected, "
+                     "we should check if they indicate error or not. Returned data:");
 
         return GP_OK;
 }
@@ -3292,11 +3291,9 @@ canon_int_list_directory (Camera *camera, const char *folder, CameraList *list,
                 }
 
                 /* 10 bytes of attributes, size and date, a name and a NULL terminating byte */
-                /* don't use GP_DEBUG since we log this with GP_LOG_DATA */
-                gp_log (GP_LOG_DATA, "canon/canon.c",
-                        "canon_int_list_directory: dirent determined to be %li=0x%lx bytes :",
-                        (long)dirent_ent_size, (long)dirent_ent_size);
-                gp_log_data ("canon", (char *)pos, dirent_ent_size);
+                GP_LOG_DATA ((char *)pos, dirent_ent_size,
+                             "canon_int_list_directory: dirent determined to be %li=0x%lx bytes :",
+                             (long)dirent_ent_size, (long)dirent_ent_size);
                 if (dirent_name_len) {
                         /* OK, this directory entry has a name in it. */
 
@@ -3858,11 +3855,9 @@ canon_int_get_info_func (Camera *camera, const char *folder,
                 }
 
                 /* 10 bytes of attributes, size and date, a name and a NULL terminating byte */
-                /* don't use GP_DEBUG since we log this with GP_LOG_DATA */
-                gp_log (GP_LOG_DATA, "canon/canon.c",
-                        "canon_int_get_info_func: dirent determined to be %li=0x%lx bytes :",
-                        (long)dirent_ent_size, (long)dirent_ent_size);
-                gp_log_data ("canon", (char *)pos, dirent_ent_size);
+                GP_LOG_DATA ((char *)pos, dirent_ent_size,
+                             "canon_int_get_info_func: dirent determined to be %li=0x%lx bytes:",
+                             (long)dirent_ent_size, (long)dirent_ent_size);
                 if (dirent_name_len) {
                         /* OK, this directory entry has a name in it. */
 
diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c
index 2602fc857..de99a9a45 100644
--- a/camlibs/canon/serial.c
+++ b/camlibs/canon/serial.c
@@ -338,11 +338,7 @@ canon_serial_recv_frame (Camera *camera, int *len)
 		*p++ = c;
 	}
 
-	/* If you don't want to see the data dumped, change the frontend to
-	 * set a lower debug level
-	 */
-	gp_log (GP_LOG_DATA, "canon", "RECV (without CANON_FBEG and CANON_FEND bytes)");
-	gp_log_data ("canon", (char *)buffer, p - buffer);
+	GP_LOG_DATA ((char *)buffer, p - buffer, "RECV (without CANON_FBEG and CANON_FEND bytes)");
 
 	if (len)
 		*len = p - buffer;
@@ -1139,11 +1135,9 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
 		return GP_ERROR;
 	}
 
-	/* don't use GP_DEBUG since we log this with GP_LOG_DATA */
-	gp_log (GP_LOG_DATA, "canon",
-		"canon_serial_get_dirents: "
-		"dirent packet received from canon_serial_dialogue:");
-	gp_log_data ("canon", (char *)p, *dirents_length);
+	GP_LOG_DATA ((char *)p, *dirents_length,
+				 "canon_serial_get_dirents: "
+				 "dirent packet received from canon_serial_dialogue:");
 
 	/* the first five bytes is only for the RS232 implementation
 	 * of this command, we do not need to copy them so therefore
@@ -1180,11 +1174,9 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
 			return GP_ERROR;
 		}
 
-		/* don't use GP_DEBUG since we log this with GP_LOG_DATA */
-		gp_log (GP_LOG_DATA, "canon",
-			"canon_serial_get_dirents: "
-			"dirent packet received from canon_serial_recv_msg:");
-		gp_log_data ("canon", (char *)p, *dirents_length);
+		GP_LOG_DATA ((char *)p, *dirents_length,
+					 "canon_serial_get_dirents: "
+					 "dirent packet received from canon_serial_recv_msg:");
 
 		/* the first five bytes is only for the RS232 implementation,
 		 * don't count them when checking dirent size
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c
index 6c38c5497..ddc04565a 100644
--- a/camlibs/canon/usb.c
+++ b/camlibs/canon/usb.c
@@ -1431,10 +1431,8 @@ canon_usb_dialogue_full (Camera *camera, canonCommandIndex canon_funct, unsigned
                 return NULL;
         }
 
-        if (payload_length) {
-                GP_DEBUG ("Payload :");
-                gp_log_data ("canon", (char *)payload, (long)payload_length);
-        }
+        if (payload_length)
+                GP_LOG_DATA ((char *)payload, (long)payload_length, "Payload:");
 
         if ((payload_length + 0x50) > sizeof (packet)) {
                 gp_log (GP_LOG_DEBUG, "canon/usb.c",
diff --git a/camlibs/hp215/hp215.c b/camlibs/hp215/hp215.c
index 89fb322c5..6a762db21 100644
--- a/camlibs/hp215/hp215.c
+++ b/camlibs/hp215/hp215.c
@@ -371,8 +371,7 @@ hp_send_command_and_receive_blob(
 		memcpy (*msg, msgbuf+5, replydatalen-2);
 	}
 	gp_log (GP_LOG_DEBUG, "hp215", "Read Blob: retcode is %04x", *retcode);
-	gp_log (GP_LOG_DEBUG, "hp215", "Read Blob: argument block is:");
-	gp_log_data ("hp215", (char*)*msg, *msglen);
+	GP_LOG_DATA ((char*)*msg, *msglen, "Read Blob: argument block is:");
 	return GP_OK;
 }
 
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 1ca979771..082a54a8f 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -2201,7 +2201,7 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 							len = size;
 							GP_LOG_E ("len=%d larger than rest size %ld", len, (size-(xdata-data)));
 						}
-						gp_log_data ("ptp2_capture_eos_preview", (char*)xdata, len);
+						GP_LOG_DATA ((char*)xdata, len, "get_viewfinder_image header:");
 						xdata = xdata+len;
 						continue;
 					case 9:
@@ -2225,13 +2225,12 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 							len  = dtoh32a(xdata);
 							type = dtoh32a(xdata+4);
 
-							GP_LOG_D ("get_viewfinder_image header: len=%d type=%d", len, type);
 							if (len > (size-(xdata-data))) {
 								len = size;
 								GP_LOG_E ("len=%d larger than rest size %ld", len, (size-(xdata-data)));
 								break;
 							}
-							gp_log_data ("ptp2_capture_eos_preview", (char*)xdata, len);
+							GP_LOG_DATA ((char*)xdata, len, "get_viewfinder_image header:");
 							xdata = xdata+len;
 						}
 						free (data);
diff --git a/camlibs/ptp2/olympus-wrap.c b/camlibs/ptp2/olympus-wrap.c
index 7f171b4ff..0484c1656 100644
--- a/camlibs/ptp2/olympus-wrap.c
+++ b/camlibs/ptp2/olympus-wrap.c
@@ -379,7 +379,7 @@ ums_wrap_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *putter)
 	GP_LOG_D ("send_scsi_cmd 2 ret  %d", ret);
 	/* skip away the 12 byte header */
 	if (recvlen >= 16)
-		gp_log_data ("ptp2/olympus/getdata", data + PTP_USB_BULK_HDR_LEN, recvlen - PTP_USB_BULK_HDR_LEN);
+		GP_LOG_DATA (data + PTP_USB_BULK_HDR_LEN, recvlen - PTP_USB_BULK_HDR_LEN, "ptp2/olympus/getdata");
 	ret = putter->putfunc ( params, putter->priv, recvlen - PTP_USB_BULK_HDR_LEN, (unsigned char*)data + PTP_USB_BULK_HDR_LEN);
 	free (data);
 	if (ret != PTP_RC_OK) {
diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c
index 2ea2b14ba..c22860f9e 100644
--- a/camlibs/ptp2/ptpip.c
+++ b/camlibs/ptp2/ptpip.c
@@ -125,7 +125,7 @@ ptp_ptpip_sendreq (PTPParams* params, PTPContainer* req)
 	default:
 		break;
 	}
-	gp_log_data ( "ptpip/oprequest", (char*)request, len);
+	GP_LOG_DATA ( (char*)request, len, "ptpip/oprequest data:");
 	ret = write (params->cmdfd, request, len);
 	free (request);
 	if (ret == -1)
@@ -149,7 +149,7 @@ ptp_ptpip_generic_read (PTPParams *params, int fd, PTPIPHeader *hdr, unsigned ch
 			perror ("read PTPIPHeader");
 			return PTP_RC_GeneralError;
 		}
-		gp_log_data ( "ptpip/generic_read", (char*)xhdr+curread, ret);
+		GP_LOG_DATA ((char*)xhdr+curread, ret, "ptpip/generic_read data:");
 		curread += ret;
 		if (ret == 0) {
 			GP_LOG_E ("End of stream after reading %d bytes of ptpipheader", ret);
@@ -174,7 +174,7 @@ ptp_ptpip_generic_read (PTPParams *params, int fd, PTPIPHeader *hdr, unsigned ch
 			free (*data);*data = NULL;
 			return PTP_RC_GeneralError;
 		} else {
-			gp_log_data ( "ptpip/generic_read", (char*)((*data)+curread), ret);
+			GP_LOG_DATA ((char*)((*data)+curread), ret, "ptpip/generic_read data:");
 		}
 		if (ret == 0)
 			break;
@@ -234,7 +234,7 @@ ptp_ptpip_senddata (PTPParams* params, PTPContainer* ptp,
 	htod32a(&request[ptpip_startdata_transid  + 8],ptp->Transaction_ID);
 	htod32a(&request[ptpip_startdata_totallen + 8],size);
 	htod32a(&request[ptpip_startdata_unknown  + 8],0);
-	gp_log_data ( "ptpip/senddata", (char*)request, sizeof(request));
+	GP_LOG_DATA ((char*)request, sizeof(request), "ptpip/senddata header:");
 	ret = write (params->cmdfd, request, sizeof(request));
 	if (ret == -1)
 		perror ("sendreq/write to cmdfd");
@@ -267,7 +267,7 @@ ptp_ptpip_senddata (PTPParams* params, PTPContainer* ptp,
 		htod32a(&xdata[ptpip_type], type);
 		htod32a(&xdata[ptpip_len], towrite2);
 		htod32a(&xdata[ptpip_data_transid+8], ptp->Transaction_ID);
-		gp_log_data("ptpip/senddata", (char*)xdata, towrite2);
+		GP_LOG_DATA ((char*)xdata, towrite2, "ptpip/senddata data:");
 		written = 0;
 		while (written < towrite2) {
 			ret = write (params->cmdfd, xdata+written, towrite2-written);
@@ -424,7 +424,7 @@ ptp_ptpip_init_command_request (PTPParams* params)
 	htod16a(&cmdrequest[ptpip_initcmd_name+(strlen(hostname)+1)*2],PTPIP_VERSION_MINOR);
 	htod16a(&cmdrequest[ptpip_initcmd_name+(strlen(hostname)+1)*2+2],PTPIP_VERSION_MAJOR);
 
-	gp_log_data ( "ptpip/init_cmd", (char*)cmdrequest, len);
+	GP_LOG_DATA ((char*)cmdrequest, len, "ptpip/init_cmd data:");
 	ret = write (params->cmdfd, cmdrequest, len);
 	free (cmdrequest);
 	if (ret == -1) {
@@ -485,7 +485,7 @@ ptp_ptpip_init_event_request (PTPParams* params)
 	htod32a(&evtrequest[ptpip_len],ptpip_eventinit_size);
 	htod32a(&evtrequest[ptpip_eventinit_idx],params->eventpipeid);
 
-	gp_log_data ( "ptpip/init_event", (char*)evtrequest, ptpip_eventinit_size);
+	GP_LOG_DATA ((char*)evtrequest, ptpip_eventinit_size, "ptpip/init_event data:");
 	ret = write (params->evtfd, evtrequest, ptpip_eventinit_size);
 	if (ret == -1) {
 		perror("write init evt request");