From b21f4bf542bd37b63ba7dc79424db6cdd1a04ca6 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Thu, 15 Sep 2016 00:47:56 +0800
Subject: [PATCH] Prefer g_strerror() to strerror()

It handles encodins better, is thread-safe and more portable.
---
 app/flatpak-builtins-enter.c | 6 +++---
 common/flatpak-run.c         | 2 +-
 common/flatpak-utils.c       | 2 +-
 document-portal/xdp-fuse.c   | 2 +-
 document-portal/xdp-main.c   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/flatpak-builtins-enter.c b/app/flatpak-builtins-enter.c
index 5cbc7d1bd..4560e084c 100644
--- a/app/flatpak-builtins-enter.c
+++ b/app/flatpak-builtins-enter.c
@@ -103,7 +103,7 @@ child_setup (gpointer user_data)
 
       if (unshare (CLONE_NEWUSER))
         {
-          g_warning ("Can't unshare user namespace: %s", strerror (errno));
+          g_warning ("Can't unshare user namespace: %s", g_strerror (errno));
           return;
         }
 
@@ -206,7 +206,7 @@ flatpak_builtin_enter (int           argc,
         {
           ns_fd[i] = open (path, O_RDONLY);
           if (ns_fd[i] == -1)
-            return flatpak_fail (error, _("Can't open %s namespace: %s"), ns_name[i], strerror (errno));
+            return flatpak_fail (error, _("Can't open %s namespace: %s"), ns_name[i], g_strerror (errno));
         }
     }
 
@@ -215,7 +215,7 @@ flatpak_builtin_enter (int           argc,
       if (ns_fd[i] != -1)
         {
           if (setns (ns_fd[i], 0) == -1)
-            return flatpak_fail (error, _("Can't enter %s namespace: %s"), ns_name[i], strerror (errno));
+            return flatpak_fail (error, _("Can't enter %s namespace: %s"), ns_name[i], g_strerror (errno));
           close (ns_fd[i]);
         }
     }
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index f1fd6ce84..af6284d8a 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -2917,7 +2917,7 @@ add_dbus_proxy_args (GPtrArray *argv_array,
     {
       int errsv = errno;
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                   _("Failed to open app info file: %s"), strerror (errsv));
+                   _("Failed to open app info file: %s"), g_strerror (errsv));
       return FALSE;
     }
 
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index ae0a0a6ab..e90f4e53c 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -355,7 +355,7 @@ flatpak_migrate_from_xdg_app (void)
           if (errno != ENOENT &&
               errno != ENOTEMPTY &&
               errno != EEXIST)
-            g_print ("Error during migration: %s\n", strerror (errno));
+            g_print ("Error during migration: %s\n", g_strerror (errno));
         }
     }
 }
diff --git a/document-portal/xdp-fuse.c b/document-portal/xdp-fuse.c
index aa7d7324c..075a2b1da 100644
--- a/document-portal/xdp-fuse.c
+++ b/document-portal/xdp-fuse.c
@@ -1378,7 +1378,7 @@ xdp_inode_locked_close_unneeded_fds (XdpInode *inode)
               g_debug ("moving %s to %s", inode->trunc_filename, inode->backing_filename);
               if (renameat (inode->dir_fd, inode->trunc_filename,
                             inode->dir_fd, inode->backing_filename) != 0)
-                g_warning ("Unable to replace truncated document: %s", strerror (errno));
+                g_warning ("Unable to replace truncated document: %s", g_strerror (errno));
             }
 
           inode->truncated = FALSE;
diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c
index d8db1604c..41a986325 100644
--- a/document-portal/xdp-main.c
+++ b/document-portal/xdp-main.c
@@ -936,9 +936,9 @@ on_name_acquired (GDBusConnection *connection,
 
   if (stat (xdp_fuse_get_mountpoint (), &stbuf) != 0)
     {
-      g_set_error (&exit_error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "fuse stat failed: %s", strerror (errno));
+      g_set_error (&exit_error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "fuse stat failed: %s", g_strerror (errno));
       final_exit_status = 7;
-      g_printerr ("fuse stat failed: %s", strerror (errno));
+      g_printerr ("fuse stat failed: %s", g_strerror (errno));
       g_main_loop_quit (loop);
       return;
     }