diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/python/py-breakpoint.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cd9e29c..f98ec27 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-12-14 Simon Marchi <simon.marchi@ericsson.com> + + * python/py-breakpoint.c (bppy_init): Use 'O' format specifier + for "qualified" and use PyObject_IsTrue. + 2017-12-14 Jan Kratochvil <jan.kratochvil@redhat.com> * dwarf2read.c (dw2_debug_names_iterator::next): Support diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index ce680c4..05291b5 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -707,9 +707,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) char *label = NULL; char *source = NULL; char *function = NULL; - int qualified = 0; + PyObject * qualified = NULL; - if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "|siiOOsssOp", keywords, + if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "|siiOOsssOO", keywords, &spec, &type, &access_type, &internal, &temporary, &source, @@ -762,7 +762,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) { event_location_up location; symbol_name_match_type func_name_match_type - = (qualified + = (qualified != NULL && PyObject_IsTrue (qualified) ? symbol_name_match_type::FULL : symbol_name_match_type::WILD); |