Remove make_hex_string

I noticed that make_hex_string does essentially the same thing as
bin2hex, and furthermore is only called in a single spot.  This patch
removes make_hex_string.

Tested by the builtbot.

gdb/ChangeLog
2019-09-25  Tom Tromey  <tom@tromey.com>

	* python/py-objfile.c (objfpy_get_build_id): Use bin2hex.
	* utils.h (make_hex_string): Don't declare.
	* utils.c (make_hex_string): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ee53e9c00a56ca30ad539cf518661760bf26d746..81f5785a78f9dd7e791a58af0a094f6f0a03a7bd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-25  Tom Tromey  <tom@tromey.com>
+
+       * python/py-objfile.c (objfpy_get_build_id): Use bin2hex.
+       * utils.h (make_hex_string): Don't declare.
+       * utils.c (make_hex_string): Remove.
+
 2019-09-24  Tom de Vries  <tdevries@suse.de>
 
        PR gdb/23815

diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
index 2c548450b4d0825e33d8a0354a4fac9d33aa9b48..517ed56dc7c0bac21f19622f74459f37193d23b2 100644 (file)
--- a/gdb/python/py-objfile.c
+++ b/gdb/python/py-objfile.c
@@ -141,10 +141,9 @@ objfpy_get_build_id (PyObject *self, void *closure)
 
   if (build_id != NULL)
     {
-      gdb::unique_xmalloc_ptr<char> hex_form
-       (make_hex_string (build_id->data, build_id->size));
+      std::string hex_form = bin2hex (build_id->data, build_id->size);
 
-      return host_string_to_python_string (hex_form.get ()).release ();
+      return host_string_to_python_string (hex_form.c_str ()).release ();
     }
 
   Py_RETURN_NONE;

diff --git a/gdb/utils.c b/gdb/utils.c
index b2535ebefd3805c27ebcc41b94d2a0cdc0eaeab1..154fcd97e2a8f730592e1ee7aae94000a01ef20d 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -736,22 +736,6 @@ gdb_print_host_address_1 (const void *addr, struct ui_file *stream)
   fprintf_filtered (stream, "%s", host_address_to_string (addr));
 }
 
-/* See utils.h.  */
-
-char *
-make_hex_string (const gdb_byte *data, size_t length)
-{
-  char *result = (char *) xmalloc (length * 2 + 1);
-  char *p;
-  size_t i;
-
-  p = result;
-  for (i = 0; i < length; ++i)
-    p += xsnprintf (p, 3, "%02x", data[i]);
-  *p = '\0';
-  return result;
-}
-
 \f
 
 /* An RAII class that sets up to handle input and then tears down

diff --git a/gdb/utils.h b/gdb/utils.h
index 7cdc73ef54f3d3150b5cdbf4ac70efcedaa27047..b0b5573239eec191424d340f860be01526e6528a 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -540,11 +540,6 @@ extern void warn_cant_dump_core (const char *reason);
 
 extern void dump_core (void);
 
-/* Return the hex string form of LENGTH bytes of DATA.
-   Space for the result is malloc'd, caller must free.  */
-
-extern char *make_hex_string (const gdb_byte *data, size_t length);
-
 /* Copy NBITS bits from SOURCE to DEST starting at the given bit
    offsets.  Use the bit order as specified by BITS_BIG_ENDIAN.
    Source and destination buffers must not overlap.  */