mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: Fix const correctness in strrchr

Browse Source 
In C23, strchr or strrchr on a const parameter now returns a const
pointer.  We saw this error:

destpaths.c: In function ‘complete_dest_paths_generator’:
destpaths.c:165:9: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
  165 |       p = strrchr (text, '/');
      |         ^

(cherry picked from commit 40fdcd0146)
This commit is contained in:
Richard W.M. Jones
2025-12-01 13:58:53 +00:00
parent 92428e5b88
commit f7224e1cbe
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fish/destpaths.c
View File

@@ -159,7 +159,7 @@ complete_dest_paths_generator (const char *text, int state)
* in that directory, otherwise list everything in /
*/
CLEANUP_FREE char *dir = NULL;
char *p;
const char *p;
struct guestfs_dirent_list *dirents;
p = strrchr (text, '/');
@@ -175,13 +175,14 @@ complete_dest_paths_generator (const char *text, int state)
for (i = 0; i < dirents->len; ++i) {
int err;
char *v;
if (STRNEQ (dirents->val[i].name, ".") &&
STRNEQ (dirents->val[i].name, "..")) {
if (STREQ (dir, "/"))
err = asprintf (&p, "/%s", dirents->val[i].name);
err = asprintf (&v, "/%s", dirents->val[i].name);
else
err = asprintf (&p, "%s/%s", dir, dirents->val[i].name);
err = asprintf (&v, "%s/%s", dir, dirents->val[i].name);
if (err >= 0) {
if (!xalloc_oversized (nr_words+1, sizeof (struct word))) {
struct word *w;
@@ -194,7 +195,7 @@ complete_dest_paths_generator (const char *text, int state)
}
else {
words = w;
words[nr_words].name = p;
words[nr_words].name = v;
if (dirents->val[i].ftyp == 'u'
|| dirents->val[i].ftyp == 'l'
|| dirents->val[i].ftyp == '?') {