fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 05:50:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

std-aux: use _nm_strerror_r

Browse source 
The function strerror_r returns an int per POSIX spec, but GNU version
returns char *. Using it fails the compilation in Alpine, so use
_nm_strerror_r instead that handles both cases.

Fixes: 41e28b900f ('daemon-helper: add read-file-as-user')
This commit is contained in:
Íñigo Huguet 2025-12-12 14:26:31 +01:00
parent 1756ec54e3
commit 599cc1ed1d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libnm-std-aux/nm-std-utils.c
View file

@ -117,7 +117,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
errbuf_len, errbuf_len,
"error getting user entry: %d (%s)\n", "error getting user entry: %d (%s)\n",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
} }
return false; return false;
} }
@ -129,7 +129,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
"failed to change group to %u: %d (%s)\n", "failed to change group to %u: %d (%s)\n",
pwentry->pw_gid, pwentry->pw_gid,
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
@ -140,7 +140,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
"failed to reset supplementary group list to %u: %d (%s)\n", "failed to reset supplementary group list to %u: %d (%s)\n",
pwentry->pw_gid, pwentry->pw_gid,
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
@ -151,7 +151,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
"failed to change user to %u: %d (%s)\n", "failed to change user to %u: %d (%s)\n",
pwentry->pw_uid, pwentry->pw_uid,
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
@ -176,7 +176,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
errbuf_len, errbuf_len,
"error opening the file: %d (%s)", "error opening the file: %d (%s)",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
@ -187,7 +187,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
errbuf_len, errbuf_len,
"error writing to stdout: %d (%s)", "error writing to stdout: %d (%s)",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
} }
@ -198,7 +198,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
errbuf_len, errbuf_len,
"error reading the file: %d (%s)", "error reading the file: %d (%s)",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }