fix the build on osx

[mono.git] / mono / dis / util.c

diff --git a/mono/dis/util.c b/mono/dis/util.c
index 49ea1df1b7e0f2cb93940d1fc7dc64927f7df2f0..e5e467d09ffcb6914bd6f6814784dacfbfaa1e6d 100644 (file)
--- a/mono/dis/util.c
+++ b/mono/dis/util.c
@@ -1,5 +1,5 @@
 /*
- * util.c: Assorted utilities for the dissasembler
+ * util.c: Assorted utilities for the disassembler
  *
  * Author:
  *   Miguel de Icaza (miguel@ximian.com)
@@ -20,7 +20,7 @@
  * Warning: returns static buffer.
  */
 const char *
-map (guint32 code, map_t *table)
+map (guint32 code, dis_map_t *table)
 {
        int i;
 
@@ -38,7 +38,7 @@ map (guint32 code, map_t *table)
  * Warning: returns static buffer.
  */
 const char *
-flags (guint32 code, map_t *table)
+flags (guint32 code, dis_map_t *table)
 {
        static char buffer [1024];
        int i;
@@ -75,9 +75,9 @@ hex_dump (const char *buffer, int base, int count)
        for (i = 0; i < count; i++){
                if (show_header)
                        if ((i % 16) == 0)
-                               printf ("\n0x%08x: ", (unsigned char) base + i);
+                               printf ("\n0x%08X: ", (unsigned char) base + i);
 
-               printf ("%02x ", (unsigned char) (buffer [i]));
+               printf ("%02X ", (unsigned char) (buffer [i]));
        }
        fflush (stdout);
 }
@@ -91,32 +91,32 @@ data_dump (const char *data, int len, const char* prefix) {
        str = g_string_new (" (");
        for (i = 0; i + 15 < len; i += 16) {
                if (i == 0)
-                       g_string_sprintfa (str, "\n");
-               g_string_sprintfa (str, "%s", prefix);
+                       g_string_append_printf (str, "\n");
+               g_string_append_printf (str, "%s", prefix);
                for (j = 0; j < 16; ++j)
-                       g_string_sprintfa (str, "%02X ", (unsigned char) (data [i + j]));
-               g_string_sprintfa (str, i == len - 16? ") // ": "  // ");
+                       g_string_append_printf (str, "%02X ", (unsigned char) (data [i + j]));
+               g_string_append_printf (str, i == len - 16? ") // ": "  // ");
                for (j = 0; j < 16; ++j)
-                       g_string_sprintfa (str, "%c", data [i + j] >= 32 && data [i + j] <= 126? data [i + j]: '.');
-               g_string_sprintfa (str, "\n");
+                       g_string_append_printf (str, "%c", data [i + j] >= 32 && data [i + j] <= 126? data [i + j]: '.');
+               g_string_append_printf (str, "\n");
        }
        if (i == len)
                return g_string_free (str, FALSE);
        if (len > 16)
-               g_string_sprintfa (str, "%s", prefix);
+               g_string_append_printf (str, "%s", prefix);
        j = i;
        for (; i < len; ++i)
-               g_string_sprintfa (str, "%02X ", (unsigned char) (data [i]));
+               g_string_append_printf (str, "%02X ", (unsigned char) (data [i]));
        if (len > 16) {
                /* align */
                int count = 16 - (len % 16);
                for (i = 0; i < count; ++i)
-                       g_string_sprintfa (str, "   ");
+                       g_string_append_printf (str, "   ");
        }
-       g_string_sprintfa (str, ") // ");
+       g_string_append_printf (str, ") // ");
        for (i = j; i < len; ++i)
-               g_string_sprintfa (str, "%c", data [i] >= 32 && data [i] <= 126? data [i]: '.');
-       g_string_sprintfa (str, "\n");
+               g_string_append_printf (str, "%c", data [i] >= 32 && data [i] <= 126? data [i]: '.');
+       g_string_append_printf (str, "\n");
        return g_string_free (str, FALSE);
 }