From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 3DDA43850413; Tue, 7 Jun 2022 13:54:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DDA43850413 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Constify solib_name_from_address X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: b11f3dbb884dfacd1d581dbccc017fa1da155ead X-Git-Newrev: 6d08aed3c98dd073d79365bc12a675fe0930aee7 Message-Id: <20220607135453.3DDA43850413@sourceware.org> Date: Tue, 7 Jun 2022 13:54:53 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2022 13:54:53 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D6d08aed3c98d= d073d79365bc12a675fe0930aee7 commit 6d08aed3c98dd073d79365bc12a675fe0930aee7 Author: Tom Tromey Date: Mon Jun 6 09:56:30 2022 -0600 Constify solib_name_from_address =20 I noticed that solib_name_from_address returned a non-const string, but it's more appropriate to return const. This patch implements this. Tested by rebuilding. Diff: --- gdb/python/py-progspace.c | 3 +-- gdb/solib.c | 2 +- gdb/solib.h | 2 +- gdb/stack.c | 5 +++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c index 5657ef7756c..a9abfb4c777 100644 --- a/gdb/python/py-progspace.c +++ b/gdb/python/py-progspace.c @@ -351,7 +351,6 @@ pspy_get_objfiles (PyObject *self_, PyObject *args) static PyObject * pspy_solib_name (PyObject *o, PyObject *args) { - char *soname; gdb_py_ulongest pc; pspace_object *self =3D (pspace_object *) o; =20 @@ -360,7 +359,7 @@ pspy_solib_name (PyObject *o, PyObject *args) if (!PyArg_ParseTuple (args, GDB_PY_LLU_ARG, &pc)) return NULL; =20 - soname =3D solib_name_from_address (self->pspace, pc); + const char *soname =3D solib_name_from_address (self->pspace, pc); if (soname =3D=3D nullptr) Py_RETURN_NONE; return host_string_to_python_string (soname).release (); diff --git a/gdb/solib.c b/gdb/solib.c index 0fbf5bc988d..7d4734b0012 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1225,7 +1225,7 @@ solib_contains_address_p (const struct so_list *const= solib, breakpoints which are in shared libraries that are not currently mapped in. */ =20 -char * +const char * solib_name_from_address (struct program_space *pspace, CORE_ADDR address) { struct so_list *so =3D NULL; diff --git a/gdb/solib.h b/gdb/solib.h index f9b4d3566d7..251028472c0 100644 --- a/gdb/solib.h +++ b/gdb/solib.h @@ -48,7 +48,7 @@ extern void solib_create_inferior_hook (int from_tty); =20 /* If ADDR lies in a shared library, return its name. */ =20 -extern char *solib_name_from_address (struct program_space *, CORE_ADDR); +extern const char *solib_name_from_address (struct program_space *, CORE_A= DDR); =20 /* Return true if ADDR lies within SOLIB. */ =20 diff --git a/gdb/stack.c b/gdb/stack.c index 71d85985d18..80801ccdb01 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1427,8 +1427,9 @@ print_frame (const frame_print_options &fp_opts, if (print_what !=3D SHORT_LOCATION && pc_p && (funname =3D=3D NULL || sal.symtab =3D=3D NULL)) { - char *lib =3D solib_name_from_address (get_frame_program_space (frame), - get_frame_pc (frame)); + const char *lib + =3D solib_name_from_address (get_frame_program_space (frame), + get_frame_pc (frame)); =20 if (lib) {