Attachment 601234 Details for Bug 844270 – Proposed patch

[patch] Proposed patch

elfutils-0.154-nm-bsd.patch (text/plain), 2.16 KB, created by Petr Machata on 2012-07-30 12:02:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Machata

Created: 2012-07-30 12:02:32 UTC

Size: 2.16 KB

patch

obsolete

>diff --git a/src/nm.c b/src/nm.c
>index 7db6fb8..eef1af4 100644
>--- a/src/nm.c
>+++ b/src/nm.c
>@@ -929,15 +929,15 @@ show_symbols_bsd (Elf *elf, const GElf_Ehdr *ehdr, GElf_Word strndx,
> 
>   static const char *const fmtstrs[] =
>     {
>-      [radix_hex] = "%8$s%2$0*1$" PRIx64 "%10$s %9$s%3$c%4$s %5$s",
>-      [radix_decimal] = "%8$s%*" PRId64 "%10$s %9$s%3$c%4$s %5$s",
>-      [radix_octal] = "%8$s%2$0*1$" PRIo64 "%10$s %9$s%3$c%4$s %5$s"
>+      [radix_hex] = "%s%0*" PRIx64 "%s %s%c%s %s",
>+      [radix_decimal] = "%s%*" PRId64 "%s %s%c%s %s",
>+      [radix_octal] = "%s%0*" PRIo64 "%s %s%c%s %s"
>     };
>   static const char *const sfmtstrs[] =
>     {
>-      [radix_hex] = "%8$s%2$0*1$" PRIx64 "%10$s %7$0*6$" PRIx64 " %9$s%3$c%4$s %5$s",
>-      [radix_decimal] = "%8$s%2$*1$" PRId64 "%10$s %7$*6$" PRId64 " %9$s%3$c%4$s %5$s",
>-      [radix_octal] = "%8$s%2$0*1$" PRIo64 "%10$s %7$0*6$" PRIo64 " %9$s%3$c%4$s %5$s"
>+      [radix_hex] = "%s%0*" PRIx64 "%s %0*" PRIx64 " %s%c%s %s",
>+      [radix_decimal] = "%s%*" PRId64 "%s %*" PRId64 " %s%c%s %s",
>+      [radix_octal] = "%s%0*" PRIo64 "%s %0*" PRIo64 " %s%c%s %s"
>     };
> 
> #ifdef USE_DEMANGLE
>@@ -1015,15 +1015,21 @@ show_symbols_bsd (Elf *elf, const GElf_Ehdr *ehdr, GElf_Word strndx,
> 		color = color_symbol;
> 	    }
> 
>-	  printf (print_size && syms[cnt].sym.st_size != 0
>-		  ? sfmtstrs[radix] : fmtstrs[radix],
>-		  digits, syms[cnt].sym.st_value,
>-		  class_type_char (elf, ehdr, &syms[cnt].sym), marker,
>-		  symstr,
>-		  digits, (uint64_t) syms[cnt].sym.st_size,
>-		  color_mode ? color_address : "",
>-		  color,
>-		  color_mode ? color_off : "");
>+	  if (print_size && syms[cnt].sym.st_size != 0)
>+	    printf (sfmtstrs[radix],
>+		    color_mode ? color_address : "",
>+		    digits, syms[cnt].sym.st_value,
>+		    color_mode ? color_off : "",
>+		    digits, (uint64_t) syms[cnt].sym.st_size,
>+		    color, class_type_char (elf, ehdr, &syms[cnt].sym),
>+		    marker, symstr);
>+	  else
>+	    printf (fmtstrs[radix],
>+		    color_mode ? color_address : "",
>+		    digits, syms[cnt].sym.st_value,
>+		    color_mode ? color_off : "", color,
>+		    class_type_char (elf, ehdr, &syms[cnt].sym),
>+		    marker, symstr);
> 	}
> 
>       if (color_mode)

Actions: View | Diff

Attachments on bug 844270: 601137 | 601138 | 601234