Use phex_nz() not printf

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9379d1921ce8358748f7cbd62d01e1bf4e1dc403..fff8f0da70e4d04179601238dfc2e6f11421e191 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-12  Andrew Cagney  <ac131313@redhat.com>
+
+       From Peter Schauer:
+       * language.c (longest_local_hex_string_custom): Use phex_nz to
+       convert NUM to a hex string.
+
 2002-01-12  Elena Zannoni  <ezannoni@redhat.com>
 
        * sh-tdep.c (sh_gdbarch_init): Move setting of long_bit earlier in

diff --git a/gdb/language.c b/gdb/language.c
index 9c27f0de5eb8241cae1c0a3905667d08ef2a25f9..f8525b6843d9242eefa690257aa2f64b5b5ce9a0 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -662,21 +662,10 @@ longest_local_hex_string_custom (LONGEST num, char *width)
   sprintf (res2, format, num);
   return res2;
 #else /* !defined (PRINTF_HAS_LONG_LONG) */
-  /* Use strcat_address_numeric to print the number into a string, then
+  /* Use phex_nz to print the number into a string, then
      build the result string from local_hex_format_prefix, padding and 
      the hex representation as indicated by "width".  */
-
-  temp_nbr_buf[0] = 0;
-  /* With use_local == 0, we don't get the leading "0x" prefix. */
-  /* MERGEBUG ?? As a quick fix I am replacing this call to
-     strcat_address_numeric with sprintf
-     strcat_address_numeric(num, 0, temp_nbr_buf, RESULT_BUF_LEN);
-   */
-
-  {
-    long long ll = num;
-    sprintf (temp_nbr_buf, "%llx", ll);
-  }
+  strcpy (temp_nbr_buf, phex_nz (num, sizeof (num)));
   /* parse width */
   parse_ptr = width;
   pad_on_left = 1;