Replace existing printf functions with trace(...)

This unifies the way printing is done. Everything goes to stderr by
default. Using genering tracing functions also removes the custom
trace_level handling.

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>

diff --git a/contour-protocol.c b/contour-protocol.c
index c9c0aa70ee9463edc9be4224d869b697cb7a91d1..99fda48096ac1db5b89dedb4afc7a134578ce737 100644 (file)
--- a/contour-protocol.c
+++ b/contour-protocol.c
@@ -40,11 +40,10 @@ static int send_msg(const struct msg *msg, int fd, int usage_code)
        }
 
        usleep(30 * 1000);
        }
 
        usleep(30 * 1000);

+

        trace(1, "Sending: ");
        trace(1, "Sending: ");

-       if (trace_level >= 3)
-               print_hex(msg->data + 1, datalen(msg->data) - 1);
-       if (trace_level >= 2)
-               print_ascii(msg->data + 1, datalen(msg->data) - 1);
+       print_hex(3, msg->data + 1, datalen(msg->data) - 1);
+       print_ascii(2, msg->data + 1, datalen(msg->data) - 1);

 
        ret = hiddev_write(msg->data, fd, usage_code);
        if (ret)
 
        ret = hiddev_write(msg->data, fd, usage_code);
        if (ret)


@@ -84,11 +83,10 @@ static int read_and_verify(struct msg *msg, int fd)
 
        memcpy(msg->data, buf, sizeof(buf));
        memset(&msg->data[sizeof(buf)], 0, sizeof(msg->data)-sizeof(buf));
 
        memcpy(msg->data, buf, sizeof(buf));
        memset(&msg->data[sizeof(buf)], 0, sizeof(msg->data)-sizeof(buf));

+

        trace(2, "Got data %d: ", datalen(buf));
        trace(2, "Got data %d: ", datalen(buf));

-       if (trace_level >= 3)
-               print_hex(buf, datalen(buf));
-       if (trace_level >= 2)
-               print_ascii(buf, datalen(buf));
+       print_hex(3, buf, datalen(buf));
+       print_ascii(2, buf, datalen(buf));

 err:
        return 0;
 }
 err:
        return 0;
 }

diff --git a/hiddev.c b/hiddev.c
index 8cf4e5a9d1bbd3947e11a2cd4b02ddc4441d6b54..889ae60aa08c394f905d7aaec8320ac9a62534b8 100644 (file)
--- a/hiddev.c
+++ b/hiddev.c
@@ -82,9 +82,9 @@ int hiddev_write(const unsigned char data[64], int fd , int usage_code)
 
        return 0;
 err2:
 
        return 0;
 err2:

-       printf("HIDIOCSREPORT\n");
+       trace(0, "HIDIOCSREPORT\n");

 err:
 err:

-       printf("Error in IOCTL: %m\n");
+       trace(0, "Error in IOCTL: %m\n");

 
        return rc;
 }
 
        return rc;
 }


@@ -101,7 +101,7 @@ static int get_usagecode(int fd)
 
        rc = ioctl(fd, HIDIOCGUCODE, &uref);
        if (rc < 0) {
 
        rc = ioctl(fd, HIDIOCGUCODE, &uref);
        if (rc < 0) {

-               printf("Error gettin usage code: %m\n");
+               trace(0, "Error gettin usage code: %m\n");

                return rc;
        }
 
                return rc;
        }
 

diff --git a/utils.c b/utils.c
index 8ae2b463ec56460f9c1676b472c3833f25863f6c..6b2f651923f4a71ecaf4d76dba64bbe70843567f 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -34,24 +34,24 @@ int datalen(const unsigned char *data)
        return len + 1;
 }
 
        return len + 1;
 }
 

-void print_hex(const unsigned char *data, int len)
+void print_hex(int level, const unsigned char *data, int len)

 {
        int i;
 
        for (i = 0; i < len; i++)
 {
        int i;
 
        for (i = 0; i < len; i++)

-               printf("0x%02x ", data[i]);
+               trace(level, "0x%02x ", data[i]);

 
 

-       printf("\n");
+       trace(level, "\n");

 }
 
 }
 

-void print_ascii(const unsigned char *data, int len)
+void print_ascii(int level, const unsigned char *data, int len)

 {
        int i;
 
        for (i = 0; i < len; i++)
 {
        int i;
 
        for (i = 0; i < len; i++)

-               printf("%c", is_printable(data[i]) ? data[i] : '.');
+               trace(level, "%c", is_printable(data[i]) ? data[i] : '.');

 
 

-       printf("\n");
+       trace(level, "\n");

 }
 
 void sanitize_ascii(unsigned char *data, int len)
 }
 
 void sanitize_ascii(unsigned char *data, int len)

diff --git a/utils.h b/utils.h
index 370cca4d1f09392cbb03471e092972249ceb579f..cbc06018a94bef45de37d62569fdcbead83ed800 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -38,8 +38,8 @@ extern int trace_level;
        } while (0)
 
 int datalen(const unsigned char *data);
        } while (0)
 
 int datalen(const unsigned char *data);

-void print_hex(const unsigned char *data, int len);
-void print_ascii(const unsigned char *data, int len);
+void print_hex(int level, const unsigned char *data, int len);
+void print_ascii(int level, const unsigned char *data, int len);

 void sanitize_ascii(unsigned char *data, int len);
 
 #endif
 void sanitize_ascii(unsigned char *data, int len);
 
 #endif