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

Merge branch 'update-errfmt-in-gunixconnection' into 'main'

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

See merge request GNOME/glib!3390
This commit is contained in:
Marco Trevisan 2023-04-21 12:05:14 +00:00
commit 3594d9615b
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gunixconnection.c
View File

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