fix printf format args
authorMarty Connor <mdc@etherboot.org>
Thu, 29 Jun 2006 19:04:25 +0000 (19:04 +0000)
committerMarty Connor <mdc@etherboot.org>
Thu, 29 Jun 2006 19:04:25 +0000 (19:04 +0000)
src/core/debug.c
src/core/image.c

index 175a2f9..4b902c2 100644 (file)
@@ -25,10 +25,10 @@ void hex_dump ( const char *data, const unsigned int len ) {
                        more();
                }
                if ( ( index % 16 ) == 0 ) {
                        more();
                }
                if ( ( index % 16 ) == 0 ) {
-                       printf ( "%X [%X] : %hX :", data + index,
+                       printf ( "%p [%lX] : %X :", data + index,
                                 virt_to_phys ( data + index ), index );
                }
                                 virt_to_phys ( data + index ), index );
                }
-               printf ( " %hhX", data[index] );
+               printf ( " %02X", data[index] );
        }
        printf ( "\n" );
 }
        }
        printf ( "\n" );
 }
@@ -64,19 +64,19 @@ int check_region ( void *region, size_t len ) {
                        /* Start of corruption */
                        if ( corrupted == 0 ) {
                                corrupted = 1;
                        /* Start of corruption */
                        if ( corrupted == 0 ) {
                                corrupted = 1;
-                               printf ( "Region %#x-%#x (physical %#x-%#x) "
+                               printf ( "Region %p-%p (physical %#lx-%#lx) "
                                         "corrupted\n",
                                         region, region + len,
                                         virt_to_phys ( region ),
                                         virt_to_phys ( region + len ) );
                        }
                        in_corruption = 1;
                                         "corrupted\n",
                                         region, region + len,
                                         virt_to_phys ( region ),
                                         virt_to_phys ( region + len ) );
                        }
                        in_corruption = 1;
-                       printf ( "--- offset %#x ", offset );
+                       printf ( "--- offset %#lx ", offset );
                } else if ( ( in_corruption != 0 ) &&
                            ( test == GUARD_SYMBOL ) ) {
                        /* End of corruption */
                        in_corruption = 0;
                } else if ( ( in_corruption != 0 ) &&
                            ( test == GUARD_SYMBOL ) ) {
                        /* End of corruption */
                        in_corruption = 0;
-                       printf ( "to offset %#x", offset );
+                       printf ( "to offset %#lx", offset );
                }
 
        }
                }
 
        }
index c60373c..d8f96b5 100644 (file)
@@ -2,6 +2,7 @@
 #include "buffer.h"
 #include "load_buffer.h"
 #include "image.h"
 #include "buffer.h"
 #include "load_buffer.h"
 #include "image.h"
+#include <console.h>
 
 static struct image images[0] __image_start;
 static struct image images_end[0] __image_end;
 
 static struct image images[0] __image_start;
 static struct image images_end[0] __image_end;