python/py-utils.c (host_string_to_python_string): New function.
gdb/ChangeLog: * python/py-utils.c (host_string_to_python_string): New function. * python/python-internal.h (host_string_to_python_string): Declare it. * python/py-*.c (*): Update all calls to PyString_Decode (str, strlen (str), host_charset (), NULL); to use host_string_to_python_string instead.
This commit is contained in:
parent
4ec9d7d564
commit
4ae6cc1962
8 changed files with 30 additions and 21 deletions
|
@ -392,7 +392,7 @@ bppy_get_location (PyObject *self, void *closure)
|
|||
str = event_location_to_string (obj->bp->location);
|
||||
if (! str)
|
||||
str = "";
|
||||
return PyString_Decode (str, strlen (str), host_charset (), NULL);
|
||||
return host_string_to_python_string (str);
|
||||
}
|
||||
|
||||
/* Python function to get the breakpoint expression. */
|
||||
|
@ -414,7 +414,7 @@ bppy_get_expression (PyObject *self, void *closure)
|
|||
if (! str)
|
||||
str = "";
|
||||
|
||||
return PyString_Decode (str, strlen (str), host_charset (), NULL);
|
||||
return host_string_to_python_string (str);
|
||||
}
|
||||
|
||||
/* Python function to get the condition expression of a breakpoint. */
|
||||
|
@ -430,7 +430,7 @@ bppy_get_condition (PyObject *self, void *closure)
|
|||
if (! str)
|
||||
Py_RETURN_NONE;
|
||||
|
||||
return PyString_Decode (str, strlen (str), host_charset (), NULL);
|
||||
return host_string_to_python_string (str);
|
||||
}
|
||||
|
||||
/* Returns 0 on success. Returns -1 on error, with a python exception set.
|
||||
|
@ -515,7 +515,7 @@ bppy_get_commands (PyObject *self, void *closure)
|
|||
ui_out_redirect (current_uiout, NULL);
|
||||
cmdstr = ui_file_xstrdup (string_file, &length);
|
||||
make_cleanup (xfree, cmdstr);
|
||||
result = PyString_Decode (cmdstr, strlen (cmdstr), host_charset (), NULL);
|
||||
result = host_string_to_python_string (cmdstr);
|
||||
do_cleanups (chain);
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue