From: Ray Strode <rstrode@redhat.com>
Date: Wed, 24 Mar 2010 18:11:47 +0000 (-0400)
Subject: [key-file] Add debugging messages
X-Git-Tag: 0.8.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e81935e030b4eceabbb0d356cc6f5ed8a880336;p=thirdparty%2Fplymouth.git

[key-file] Add debugging messages
---

diff --git a/src/libply/ply-key-file.c b/src/libply/ply-key-file.c
index c1987b0a..bd8d22ec 100644
--- a/src/libply/ply-key-file.c
+++ b/src/libply/ply-key-file.c
@@ -38,6 +38,7 @@
 
 #include "ply-utils.h"
 #include "ply-hashtable.h"
+#include "ply-logger.h"
 
 typedef struct
 {
@@ -70,7 +71,11 @@ ply_key_file_open_file (ply_key_file_t *key_file)
   key_file->fp = fopen (key_file->filename, "r");
 
   if (key_file->fp == NULL)
-    return false;
+    {
+      ply_trace ("Failed to open key file %s: %m",
+                 key_file->filename);
+      return false;
+    }
   return true;
 }
 
@@ -155,6 +160,7 @@ ply_key_file_load_group (ply_key_file_t *key_file,
   group->name = strdup (group_name);
   group->entries = ply_hashtable_new (ply_hashtable_string_hash, ply_hashtable_string_compare);
 
+  ply_trace ("trying to load group %s", group_name);
   do
     {
       ply_key_file_entry_t *entry;
@@ -204,7 +210,10 @@ ply_key_file_load_groups (ply_key_file_t *key_file)
       items_matched = fscanf (key_file->fp, " [ %a[^]] ] ", &group_name);
 
       if (items_matched <= 0)
-        break;
+        {
+          ply_trace ("key file has no groups");
+          break;
+        }
 
       group = ply_key_file_load_group (key_file, group_name);
 
@@ -233,6 +242,11 @@ ply_key_file_load (ply_key_file_t *key_file)
 
   was_loaded = ply_key_file_load_groups (key_file);
 
+  if (!was_loaded)
+    {
+      ply_trace ("was unable to load any groups");
+    }
+
   ply_key_file_close_file (key_file);
 
   return was_loaded;
@@ -282,12 +296,18 @@ ply_key_file_get_value (ply_key_file_t *key_file,
   group = ply_key_file_find_group (key_file, group_name);
 
   if (group == NULL)
-    return NULL;
+    {
+      ply_trace ("key file does not have group '%s'", group_name);
+      return NULL;
+    }
 
   entry = ply_key_file_find_entry (key_file, group, key);
 
   if (entry == NULL)
-    return NULL;
+    {
+      ply_trace ("key file does not have entry for key '%s'", key);
+      return NULL;
+    }
 
   return strdup (entry->value);
 }