Convert some g_warning() uses to udisks_warning()

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/src/main.c b/src/main.c
index 0039fe8..6bec07d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -136,7 +136,7 @@ main (int    argc,
         }
       else
         {
-          g_warning ("Error opening /dev/null: %m");
+          udisks_warning ("Error opening /dev/null: %m");
         }
     }
 

diff --git a/src/udisksdaemon.c b/src/udisksdaemon.c
index e2baf3e..00aad6f 100644 (file)
--- a/src/udisksdaemon.c
+++ b/src/udisksdaemon.c
@@ -1194,11 +1194,10 @@ udisks_daemon_mounted_fs_cleanup (UDisksDaemon *daemon)
                                         new_value, /* consumes new_value */
                                         &error))
         {
-          g_warning ("%s: Error setting mounted-fs: %s (%s, %d)",
-                     G_STRFUNC,
-                     error->message,
-                     g_quark_to_string (error->domain),
-                     error->code);
+          udisks_warning ("Error setting mounted-fs: %s (%s, %d)",
+                          error->message,
+                          g_quark_to_string (error->domain),
+                          error->code);
           g_error_free (error);
           goto out;
         }

diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c
index b559730..9d1632b 100644 (file)
--- a/src/udisksdaemonutil.c
+++ b/src/udisksdaemonutil.c
@@ -33,6 +33,7 @@
 #include "udisksdaemon.h"
 #include "udisksdaemonutil.h"
 #include "udiskscleanup.h"
+#include "udiskslogging.h"
 
 /**
  * SECTION:udisksdaemonutil
@@ -80,7 +81,7 @@ udisks_decode_udev_string (const gchar *str)
 
           if (str[n + 1] != 'x' || str[n + 2] == '\0' || str[n + 3] == '\0')
             {
-              g_warning ("**** NOTE: malformed encoded string `%s'", str);
+              udisks_warning ("**** NOTE: malformed encoded string `%s'", str);
               break;
             }
 
@@ -98,7 +99,7 @@ udisks_decode_udev_string (const gchar *str)
 
   if (!g_utf8_validate (s->str, -1, &end_valid))
     {
-      g_warning ("The string `%s' is not valid UTF-8. Invalid characters begins at `%s'", s->str, end_valid);
+      udisks_warning ("The string `%s' is not valid UTF-8. Invalid characters begins at `%s'", s->str, end_valid);
       ret = g_strndup (s->str, end_valid - s->str);
       g_string_free (s, TRUE);
     }

diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index 99e391f..4fa55f9 100644 (file)
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -870,7 +870,7 @@ unescape_fstab (const gchar *source)
           switch (*p)
             {
             case '\0':
-              g_warning ("unescape_fstab: trailing \\");
+              udisks_warning ("unescape_fstab: trailing \\");
               goto out;
             case '0':  case '1':  case '2':  case '3':  case '4':
             case '5':  case '6':  case '7':

diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index 2e0d128..9809c2b 100644 (file)
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -182,11 +182,11 @@ is_in_filesystem_file (const gchar *filesystems_file,
                             NULL, /* gsize *out_length */
                             &error))
     {
-      g_warning ("Error reading %s: %s (%s %d)",
-                 filesystems_file,
-                 error->message,
-                 g_quark_to_string (error->domain),
-                 error->code);
+      udisks_warning ("Error reading %s: %s (%s %d)",
+                      filesystems_file,
+                      error->message,
+                      g_quark_to_string (error->domain),
+                      error->code);
       g_error_free (error);
       goto out;
     }
@@ -328,7 +328,7 @@ find_primary_gid (uid_t uid)
   pw = getpwuid (uid);
   if (pw == NULL)
     {
-      g_warning ("Couldn't look up uid %d: %m", uid);
+      udisks_warning ("Error looking up uid %d: %m", uid);
       goto out;
     }
   gid = pw->pw_gid;
@@ -354,7 +354,7 @@ is_uid_in_gid (uid_t uid,
   pw = getpwuid (uid);
   if (pw == NULL)
     {
-      g_warning ("Couldn't look up uid %d: %m", uid);
+      udisks_warning ("Error looking up uid %d: %m", uid);
       goto out;
     }
   if (pw->pw_gid == gid)
@@ -365,7 +365,7 @@ is_uid_in_gid (uid_t uid,
 
   if (getgrouplist (pw->pw_name, pw->pw_gid, supplementary_groups, &num_supplementary_groups) < 0)
     {
-      g_warning ("Couldn't find supplementary groups for uid %d: %m", uid);
+      udisks_warning ("Error getting supplementary groups for uid %d: %m", uid);
       goto out;
     }
 

diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c
index be2706a..43adaa5 100644 (file)
--- a/src/udisksmountmonitor.c
+++ b/src/udisksmountmonitor.c
@@ -33,6 +33,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "udiskslogging.h"
 #include "udisksmountmonitor.h"
 #include "udisksmount.h"
 #include "udisksprivate.h"
@@ -428,7 +429,7 @@ udisks_mount_monitor_get_mountinfo (UDisksMountMonitor  *monitor,
                   encoded_root,
                   encoded_mount_point) != 6)
         {
-          g_warning ("%s: Error parsing line '%s'", G_STRFUNC, lines[n]);
+          udisks_warning ("Error parsing line '%s'", lines[n]);
           continue;
         }
 
@@ -455,7 +456,7 @@ udisks_mount_monitor_get_mountinfo (UDisksMountMonitor  *monitor,
 
               if (sscanf (sep + 3, "%s %s", fstype, mount_source) != 2)
                 {
-                  g_warning ("%s: Error parsing things past - for '%s'", G_STRFUNC, lines[n]);
+                  udisks_warning ("Error parsing things past - for '%s'", lines[n]);
                   continue;
                 }
 
@@ -467,13 +468,13 @@ udisks_mount_monitor_get_mountinfo (UDisksMountMonitor  *monitor,
 
               if (stat (mount_source, &statbuf) != 0)
                 {
-                  g_warning ("%s: Error statting %s: %m", G_STRFUNC, mount_source);
+                  udisks_warning ("Error statting %s: %m", mount_source);
                   continue;
                 }
 
               if (!S_ISBLK (statbuf.st_mode))
                 {
-                  g_warning ("%s: %s is not a block device", G_STRFUNC, mount_source);
+                  udisks_warning ("%s is not a block device", mount_source);
                   continue;
                 }
 
@@ -548,13 +549,13 @@ udisks_mount_monitor_get_swaps (UDisksMountMonitor  *monitor,
 
       if (sscanf (lines[n], "%s", filename) != 1)
         {
-          g_warning ("%s: Error parsing line '%s'", G_STRFUNC, lines[n]);
+          udisks_warning ("Error parsing line '%s'", lines[n]);
           continue;
         }
 
       if (stat (filename, &statbuf) != 0)
         {
-          g_warning ("%s: Error statting %s: %m", G_STRFUNC, filename);
+          udisks_warning ("Error statting %s: %m", filename);
           continue;
         }
 
@@ -590,16 +591,16 @@ udisks_mount_monitor_ensure (UDisksMountMonitor *monitor)
   error = NULL;
   if (!udisks_mount_monitor_get_mountinfo (monitor, &error))
     {
-      g_warning ("Error getting mounts: %s (%s, %d)",
-                 error->message, g_quark_to_string (error->domain), error->code);
+      udisks_warning ("Error getting mounts: %s (%s, %d)",
+                      error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
 
   error = NULL;
   if (!udisks_mount_monitor_get_swaps (monitor, &error))
     {
-      g_warning ("Error getting swaps: %s (%s, %d)",
-                 error->message, g_quark_to_string (error->domain), error->code);
+      udisks_warning ("Error getting swaps: %s (%s, %d)",
+                      error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }