Make print_hexl function write to stdout rather than using printerr
authorKevin Coffman <kwc@citi.umich.edu>
Fri, 12 Oct 2007 20:34:49 +0000 (16:34 -0400)
committerNeil Brown <neilb@suse.de>
Sun, 14 Oct 2007 23:50:55 +0000 (09:50 +1000)
print_hexl() currently uses printerr, but is really only necessary
for local debugging and should simply write to stdout.
Also change it to print the description internally.
Wrap it and its use in #ifdef DEBUG.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
utils/gssd/svcgssd_proc.c

index 7c58f7b..52c3aaf 100644 (file)
@@ -250,42 +250,43 @@ out:
        return res;
 }
 
        return res;
 }
 
+#ifdef DEBUG
 void
 void
-print_hexl(int pri, unsigned char *cp, int length)
+print_hexl(const char *description, unsigned char *cp, int length)
 {
        int i, j, jm;
        unsigned char c;
 
 {
        int i, j, jm;
        unsigned char c;
 
-       printerr(pri, "length %d\n",length);
-       printerr(pri, "\n");
+       printf("%s (length %d)\n", description, length);
 
        for (i = 0; i < length; i += 0x10) {
 
        for (i = 0; i < length; i += 0x10) {
-               printerr(pri, "  %04x: ", (u_int)i);
+               printf("  %04x: ", (u_int)i);
                jm = length - i;
                jm = jm > 16 ? 16 : jm;
 
                for (j = 0; j < jm; j++) {
                        if ((j % 2) == 1)
                jm = length - i;
                jm = jm > 16 ? 16 : jm;
 
                for (j = 0; j < jm; j++) {
                        if ((j % 2) == 1)
-                               printerr(pri,"%02x ", (u_int)cp[i+j]);
+                               printf("%02x ", (u_int)cp[i+j]);
                        else
                        else
-                               printerr(pri,"%02x", (u_int)cp[i+j]);
+                               printf("%02x", (u_int)cp[i+j]);
                }
                for (; j < 16; j++) {
                        if ((j % 2) == 1)
                }
                for (; j < 16; j++) {
                        if ((j % 2) == 1)
-                               printerr(pri,"   ");
+                               printf("   ");
                        else
                        else
-                               printerr(pri,"  ");
+                               printf("  ");
                }
                }
-               printerr(pri," ");
+               printf(" ");
 
                for (j = 0; j < jm; j++) {
                        c = cp[i+j];
                        c = isprint(c) ? c : '.';
 
                for (j = 0; j < jm; j++) {
                        c = cp[i+j];
                        c = isprint(c) ? c : '.';
-                       printerr(pri,"%c", c);
+                       printf("%c", c);
                }
                }
-               printerr(pri,"\n");
+               printf("\n");
        }
 }
        }
 }
+#endif
 
 void
 handle_nullreq(FILE *f) {
 
 void
 handle_nullreq(FILE *f) {
@@ -326,13 +327,15 @@ handle_nullreq(FILE *f) {
 
        in_handle.length = (size_t) qword_get(&cp, in_handle.value,
                                              sizeof(in_handle_buf));
 
        in_handle.length = (size_t) qword_get(&cp, in_handle.value,
                                              sizeof(in_handle_buf));
-       printerr(2, "in_handle: \n");
-       print_hexl(2, in_handle.value, in_handle.length);
+#ifdef DEBUG
+       print_hexl("in_handle", in_handle.value, in_handle.length);
+#endif
 
        in_tok.length = (size_t) qword_get(&cp, in_tok.value,
                                           sizeof(in_tok_buf));
 
        in_tok.length = (size_t) qword_get(&cp, in_tok.value,
                                           sizeof(in_tok_buf));
-       printerr(2, "in_tok: \n");
-       print_hexl(2, in_tok.value, in_tok.length);
+#ifdef DEBUG
+       print_hexl("in_tok", in_tok.value, in_tok.length);
+#endif
 
        if (in_tok.length < 0) {
                printerr(0, "WARNING: handle_nullreq: "
 
        if (in_tok.length < 0) {
                printerr(0, "WARNING: handle_nullreq: "