Adding Pamphlet for Brian.

diff --git a/hexdump.h b/hexdump.h
index 9b2cadf57525864d9b290088c9e31ea035be9a1e..5f36144973478f878fed822ea47f4796cf79a6e1 100644 (file)
--- a/hexdump.h
+++ b/hexdump.h
@@ -44,28 +44,30 @@ _disused static char hexchar(uint8_t value) {
     return value < 0x20 || value >= 0x80 ? '.' : value;
 }
 
     return value < 0x20 || value >= 0x80 ? '.' : value;
 }
 

+#define HexWidth_ 12
+

 _disused static void hexdump(const char *mark, const uint8_t *data, size_t size) {
     int i = 0, j;
 
     while (i != size) {
 _disused static void hexdump(const char *mark, const uint8_t *data, size_t size) {
     int i = 0, j;
 
     while (i != size) {

-        if (i % 16 == 0)
+        if (i % HexWidth_ == 0)

             printf("[%s] 0x%.3x:", mark, i);
 
         printf(" %.2x", data[i]);
 
             printf("[%s] 0x%.3x:", mark, i);
 
         printf(" %.2x", data[i]);
 

-        if (++i % 16 == 0) {
+        if (++i % HexWidth_ == 0) {

             printf("  ");
             printf("  ");

-            for (j = i - 16; j != i; ++j)
+            for (j = i - HexWidth_; j != i; ++j)

                 printf("%c", hexchar(data[j]));
             printf("\n");
         }
     }
 
                 printf("%c", hexchar(data[j]));
             printf("\n");
         }
     }
 

-    if (i % 16 != 0) {
-        for (j = i % 16; j != 16; ++j)
+    if (i % HexWidth_ != 0) {
+        for (j = i % HexWidth_; j != HexWidth_; ++j)

             printf("   ");
         printf("  ");
             printf("   ");
         printf("  ");

-        for (j = i / 16 * 16; j != i; ++j)
+        for (j = i / HexWidth_ * HexWidth_; j != i; ++j)

             printf("%c", hexchar(data[j]));
         printf("\n");
     }
             printf("%c", hexchar(data[j]));
         printf("\n");
     }

diff --git a/stdlib.h b/stdlib.h
index 06709ebd51af836b6b668fae6dac36e155afb1af..0f24d7d6240c19a180975a9ee07f3ad4cbd6a4fb 100644 (file)
--- a/stdlib.h
+++ b/stdlib.h
@@ -58,7 +58,7 @@
     for (;;)
 
 #define _trace() \
     for (;;)
 
 #define _trace() \

-    printf("_trace(%s:%u)\n", __FILE__, __LINE__)
+    printf("_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__)

 
 #define _not(type) \
     ((type) ~ (type) 0)
 
 #define _not(type) \
     ((type) ~ (type) 0)