luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
restore error messages in gunixconnection while maintaining older compiler support

See merge request GNOME/glib!3400
This commit is contained in:
Philip Withnall 2023-04-26 16:27:34 +00:00
commit 8d527919b4
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gio/gunixconnection.c
View File

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