luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 08:16:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error format in gio/gunixconnection.c (part 2)

Browse Source 
Update a series of error messages to use `g_set_error_literal` instead
of `g_set_error`. This should prevent `format-nonliteral` compiler
issues when `-Werror` is configured:

    ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_fd’:
    ../gio/gunixconnection.c:183:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
      183 |         nscm);
          |         ^~~~
    ../gio/gunixconnection.c:217:20: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
      217 |                    nfd);
          |                    ^~~
    ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_credentials’:
    ../gio/gunixconnection.c:601:24: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
      601 |                        nscm);
          |                        ^~~~

This is similar to a previous change [1] made to `gunixconnection.c`.

[1]: 44b3d5d80445234041f6c59feb89645f7102c3a4

Signed-off-by: James Knight <james.d.knight@live.com>


(cherry picked from commit 4ae8606b6f)
This commit is contained in:
James Knight 2023-04-20 23:41:32 -04:00 committed by Marco Trevisan
parent aa3e3225a7
commit e82348db62
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gio/gunixconnection.c
View File

@ -176,11 +176,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection,
{
gint i;
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
ngettext("Expecting 1 control message, got %d",
"Expecting 1 control message, got %d",
nscm),
nscm);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
ngettext ("Expecting 1 control message, got %d",
"Expecting 1 control message, got %d",
nscm));
for (i = 0; i < nscm; i++)
g_object_unref (scms[i]);
@ -210,11 +209,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection,
{
gint i;
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
ngettext("Expecting one fd, but got %d\n",
"Expecting one fd, but got %d\n",
nfd),
nfd);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
ngettext ("Expecting one fd, but got %d\n",
"Expecting one fd, but got %d\n",
nfd));
for (i = 0; i < nfd; i++)
close (fds[i]);
@ -592,13 +590,12 @@ g_unix_connection_receive_credentials (GUnixConnection *connection,
{
if (nscm != 1)
{
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
ngettext("Expecting 1 control message, got %d",
"Expecting 1 control message, got %d",
nscm),
nscm);
g_set_error_literal (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
ngettext ("Expecting 1 control message, got %d",
"Expecting 1 control message, got %d",
nscm));
goto out;
}