FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/python: Make cmdpy_completer_helper return gdbpy_ref<>

Browse source 
Make cmdpy_completer_helper return a gdbpy_ref<> directly rather than
building a gdbpy_ref<>, releasing it, and then having a new
gdbpy_ref<> created to hold the result.

gdb/ChangeLog:

	* python/py-cmd.c (cmdpy_completer_helper): Return gdbpy_ref<>.
	(cmdpy_completer_handle_brkchars): Adjust.
	(cmdpy_completer): Adjust.
This commit is contained in:
Andrew Burgess 2018-09-10 11:48:28 +01:00
parent ee67fd7f3f
commit 50db9ef4c0
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gdb/python/py-cmd.c
View file

@ -174,10 +174,10 @@ cmdpy_function (struct cmd_list_element *command,
and then a "complete"-completion sequentially. Therefore, we just
recalculate everything twice for TAB-completions.
This function returns the PyObject representing the Python method
call. */
This function returns a reference to the PyObject representing the
Python method call. */
static PyObject *
static gdbpy_ref<>
cmdpy_completer_helper (struct cmd_list_element *command,
const char *text, const char *word)
{
@ -220,7 +220,7 @@ cmdpy_completer_helper (struct cmd_list_element *command,
PyErr_Clear ();
}
return resultobj.release ();
return resultobj;
}
/* Python function called to determine the break characters of a
@ -235,9 +235,9 @@ cmdpy_completer_handle_brkchars (struct cmd_list_element *command,
{
gdbpy_enter enter_py (get_current_arch (), current_language);
/* Calling our helper to obtain the PyObject of the Python
/* Calling our helper to obtain a reference to the PyObject of the Python
function. */
gdbpy_ref<> resultobj (cmdpy_completer_helper (command, text, word));
gdbpy_ref<> resultobj = cmdpy_completer_helper (command, text, word);
/* Check if there was an error. */
if (resultobj == NULL)
@ -278,9 +278,9 @@ cmdpy_completer (struct cmd_list_element *command,
{
gdbpy_enter enter_py (get_current_arch (), current_language);
/* Calling our helper to obtain the PyObject of the Python
/* Calling our helper to obtain a reference to the PyObject of the Python
function. */
gdbpy_ref<> resultobj (cmdpy_completer_helper (command, text, word));
gdbpy_ref<> resultobj = cmdpy_completer_helper (command, text, word);
/* If the result object of calling the Python function is NULL, it
means that there was an error. In this case, just give up. */