diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/python/py-inferior.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-prettyprint.c | 10 | ||||
| -rw-r--r-- | gdb/python/py-value.c | 3 |
4 files changed, 18 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca172d1..f718b4d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2013-04-19 Pedro Alves <palves@redhat.com> + * python/py-inferior.c (infpy_write_memory): Add cast to gdb_byte + * python/py-prettyprint.c (print_string_repr): Change type of + 'output' local to char *. Add cast to gdb_byte * in + LA_PRINT_STRING call. + (print_children): Change type of 'output' local to char *. + * python/py-value.c (valpy_string): Add cast to const char * in + PyUnicode_Decode call. + +2013-04-19 Pedro Alves <palves@redhat.com> + * remote-mips.c (mips_cksum): Rename 'data' parameter to 'datastr' and change its type to 'const char *'. Adjust. (mips_send_packet): Add cast to 'char *', and remove cast to diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 9c84904..4af7131 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -513,7 +513,7 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw) error = 1; break; } - write_memory_with_notification (addr, buffer, length); + write_memory_with_notification (addr, (gdb_byte *) buffer, length); } #ifdef IS_PY3K PyBuffer_Release (&pybuf); diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index dbf6c22..b50e757 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -343,13 +343,13 @@ print_string_repr (PyObject *printer, const char *hint, string = python_string_to_target_python_string (py_str); if (string) { - gdb_byte *output; + char *output; long length; struct type *type; make_cleanup_py_decref (string); #ifdef IS_PY3K - output = (gdb_byte *) PyBytes_AS_STRING (string); + output = PyBytes_AS_STRING (string); length = PyBytes_GET_SIZE (string); #else output = PyString_AsString (string); @@ -358,8 +358,8 @@ print_string_repr (PyObject *printer, const char *hint, type = builtin_type (gdbarch)->builtin_char; if (hint && !strcmp (hint, "string")) - LA_PRINT_STRING (stream, type, output, length, NULL, - 0, options); + LA_PRINT_STRING (stream, type, (gdb_byte *) output, + length, NULL, 0, options); else fputs_filtered (output, stream); } @@ -634,7 +634,7 @@ print_children (PyObject *printer, const char *hint, } else if (gdbpy_is_string (py_v)) { - gdb_byte *output; + char *output; output = python_string_to_host_string (py_v); if (!output) diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 11cc038..2cbb0cb 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -421,7 +421,8 @@ valpy_string (PyObject *self, PyObject *args, PyObject *kw) GDB_PY_HANDLE_EXCEPTION (except); encoding = (user_encoding && *user_encoding) ? user_encoding : la_encoding; - unicode = PyUnicode_Decode (buffer, length * TYPE_LENGTH (char_type), + unicode = PyUnicode_Decode ((const char *) buffer, + length * TYPE_LENGTH (char_type), encoding, errors); xfree (buffer); |