Start with "/usr", not "usr". Pointed out by Tim Rowley.

Thu Nov  9 17:31:17 2006  Søren Sandmann  <sandmann@redhat.com>

        * binfile.c (get_debug_file): Start with "/usr", not
        "usr". Pointed out by Tim Rowley.

        * binparser.c (bin_parser_align): Pass byte_width on instead of
        hardcoding 4.

diff --git a/ChangeLog b/ChangeLog
index e015298..bf861fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov  9 17:31:17 2006  Søren Sandmann  <sandmann@redhat.com>
+
+       * binfile.c (get_debug_file): Start with "/usr", not
+       "usr". Pointed out by Tim Rowley.
+
+       * binparser.c (bin_parser_align): Pass byte_width on instead of
+       hardcoding 4. 
+
 Thu Nov  9 16:47:35 2006  Søren Sandmann  <sandmann@redhat.com>
 
        Look in the correct directory for debug info files. (Tim Rowley)

diff --git a/binfile.c b/binfile.c
index eafd126..d53ca83 100644 (file)
--- a/binfile.c
+++ b/binfile.c
@@ -88,7 +88,7 @@ separate_debug_file_exists (const char *name, guint32 crc)
 
     if (file_crc != crc)
     {
-       g_print ("warning: %s has wrong crc\n", name);
+       g_print ("warning: %s has wrong crc \n", name);
        
        elf_parser_free (parser);
        
@@ -133,7 +133,7 @@ get_debug_file (ElfParser *elf,
     
     tries[0] = g_build_filename (dir, basename, NULL);
     tries[1] = g_build_filename (dir, ".debug", basename, NULL);
-    tries[2] = g_build_filename ("usr", "lib", "debug", dir, basename, NULL);
+    tries[2] = g_build_filename ("/usr", "lib", "debug", dir, basename, NULL);
     tries[3] = g_build_filename (debug_file_directory, dir, basename, NULL);
 
     for (i = 0; i < N_TRIES; ++i)

diff --git a/binparser.c b/binparser.c
index c947aff..719acda 100644 (file)
--- a/binparser.c
+++ b/binparser.c
@@ -303,7 +303,7 @@ void
 bin_parser_align (BinParser *parser,
                  gsize      byte_width)
 {
-    parser->offset = align (parser->offset, 4);
+    parser->offset = align (parser->offset, byte_width);
 }
 
 void