[Apcupsd-commits] apcupsd/src/drivers/usb/generic generic-usb.c,1.2,1.3 hidutils.c,1.2,1.3

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/src/drivers/usb/generic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10553/src/drivers/usb/generic

Modified Files:
	generic-usb.c hidutils.c 
Log Message:
Fix up some debug prints to use logf so they end up in the trace log at
the proper point.


Index: hidutils.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/drivers/usb/generic/hidutils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hidutils.c	24 Jan 2006 02:14:24 -0000	1.2
+++ hidutils.c	23 Feb 2006 04:35:06 -0000	1.3
@@ -72,13 +72,13 @@
    }
 
    if (debug_level >= 300) {
-      printf("Report descriptor (length=%d):\n", rdesclen);
+      logf("Report descriptor (length=%d):\n", rdesclen);
       for (i = 0; i < rdesclen; i++) {
-         printf("%02x, ", ptr[i]);
+         logf("%02x, ", ptr[i]);
          if ((i+1)%16 == 0)
-            printf("\n");
+            logf("\n");
       }
-      printf("\n");
+      logf("\n");
    }
 
    *rlen = rdesclen;
@@ -225,10 +225,10 @@
    }
 
    if (debug_level >= 300) {
-      printf("%02x: ", item->report_ID);
+      logf("%02x: ", item->report_ID);
       for (i = 0; i < actlen; i++)
-         printf("%02x,", data[i]);
-      printf("\n");
+         logf("%02x,", data[i]);
+      logf("\n");
    }
 
    return actlen;
@@ -247,10 +247,10 @@
       item->report_ID, item->kind, len, item->pos);
 
    if (debug_level >= 300) {
-      printf("%02x: ", item->report_ID);
+      logf("%02x: ", item->report_ID);
       for (i = 0; i < len; i++)
-         printf("%02x,", data[i]);
-      printf("\n");
+         logf("%02x,", data[i]);
+      logf("\n");
    }
 
    actlen = usb_control_msg( fd,

Index: generic-usb.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/drivers/usb/generic/generic-usb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generic-usb.c	24 Jan 2006 02:14:24 -0000	1.2
+++ generic-usb.c	23 Feb 2006 04:35:06 -0000	1.3
@@ -530,10 +530,10 @@
       }
 
       if (debug_level >= 300) {
-         printf("Interrupt data: ");
+         logf("Interrupt data: ");
          for (i = 0; i < retval; i++)
-            printf("%02x, ", buf[i]);
-         printf("\n");
+            logf("%02x, ", buf[i]);
+         logf("\n");
       }
 
       write_lock(ups);