diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-26 16:27:34 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-26 16:27:34 +0000 |
commit | 8d527919b48a6062621281309dbae548a2bceea9 (patch) | |
tree | 1c7436ae0646cc751422f8e43c59db1bd690f432 /gio | |
parent | 0c81ab6dac8444c80af26cb2ecaf338015cf6c92 (diff) | |
parent | 55e93a8278d12d41cfffc9e9c811a55fde844b7c (diff) |
Merge branch 'update-errfmt-in-gunixconnection-part3' into 'main'
restore error messages in gunixconnection while maintaining older compiler support
See merge request GNOME/glib!3400
Diffstat (limited to 'gio')
-rw-r--r-- | gio/gunixconnection.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c index c012fcbfe..7b466cdf9 100644 --- a/gio/gunixconnection.c +++ b/gio/gunixconnection.c @@ -176,10 +176,12 @@ g_unix_connection_receive_fd (GUnixConnection *connection, { gint i; - 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)); + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + g_dngettext (NULL, + "Expecting 1 control message, got %d", + "Expecting 1 control message, got %d", + nscm), + nscm); for (i = 0; i < nscm; i++) g_object_unref (scms[i]); @@ -209,10 +211,12 @@ g_unix_connection_receive_fd (GUnixConnection *connection, { gint i; - 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)); + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + g_dngettext (NULL, + "Expecting one fd, but got %d\n", + "Expecting one fd, but got %d\n", + nfd), + nfd); for (i = 0; i < nfd; i++) close (fds[i]); @@ -590,12 +594,14 @@ g_unix_connection_receive_credentials (GUnixConnection *connection, { if (nscm != 1) { - 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)); + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_FAILED, + g_dngettext (NULL, + "Expecting 1 control message, got %d", + "Expecting 1 control message, got %d", + nscm), + nscm); goto out; } |