From: Pedro Alves <palves@redhat.com>
Date: Wed, 6 Mar 2013 19:51:18 +0000 (+0000)
Subject: Garbage collect py-utils.c:target_string_to_unicode.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=634334ab5ea40ac0a17e5a020a772ed14c23fcb7;p=deliverable%2Fbinutils-gdb.git

Garbage collect py-utils.c:target_string_to_unicode.

The strlen in this function looked suspicious, for the function
documents that STR is in the target's charset (what if it is utf-32,
etc.).

On closer inspection, nothing is calling the function, and it's been
that way ever since the function was added.

gdb/
2013-03-06  Pedro Alves  <palves@redhat.com>

	* python/py-utils.c (target_string_to_unicode): Delete function.
	* python/python-internal.h (target_string_to_unicode): Delete
	declaration.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9857be4dbb..26c50a2ed5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-06  Pedro Alves  <palves@redhat.com>
+
+	* python/py-utils.c (target_string_to_unicode): Delete function.
+	* python/python-internal.h (target_string_to_unicode): Delete
+	declaration.
+
 2013-03-06  Pierre Muller  <muller@sourceware.org>
 
 	* linespec.c (get_current_search_block): ARI fix, use (void)
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c
index a3ae61fe02..b280c8cc71 100644
--- a/gdb/python/py-utils.c
+++ b/gdb/python/py-utils.c
@@ -204,19 +204,6 @@ python_string_to_host_string (PyObject *obj)
   return result;
 }
 
-/* Converts a target string of LENGTH bytes in the target's charset to a
-   Python Unicode string. If LENGTH is -1, convert until a null byte is found.
-
-   Returns NULL on error, with a python exception set.  */
-PyObject *
-target_string_to_unicode (const gdb_byte *str, int length)
-{
-  if (length == -1)
-    length = strlen (str);
-
-  return PyUnicode_Decode (str, length, target_charset (python_gdbarch), NULL);
-}
-
 /* Return true if OBJ is a Python string or unicode object, false
    otherwise.  */
 
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 8dff1d7638..753ba96a01 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -335,7 +335,6 @@ char *unicode_to_target_string (PyObject *unicode_str);
 char *python_string_to_target_string (PyObject *obj);
 PyObject *python_string_to_target_python_string (PyObject *obj);
 char *python_string_to_host_string (PyObject *obj);
-PyObject *target_string_to_unicode (const gdb_byte *str, int length);
 int gdbpy_is_string (PyObject *obj);
 char *gdbpy_obj_to_string (PyObject *obj);
 char *gdbpy_exception_to_string (PyObject *ptype, PyObject *pvalue);