[dconf] path checking: check for NULL

[Ryan Lortie <ryanl src gnome org>]

commit 90d1ea35cf93e2b94c55cc54307841467ecff1c9
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu May 5 12:20:52 2011 +0200

    path checking: check for NULL
    
    Check for NULL dconf key/dir/path and report it as an error.

 common/dconf-paths.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/common/dconf-paths.c b/common/dconf-paths.c
index 1278d64..6f82ee9 100644
--- a/common/dconf-paths.c
+++ b/common/dconf-paths.c
@@ -41,6 +41,14 @@
 #define DCONF_ERROR 0
 #define DCONF_ERROR_PATH 0
 
+#define nonnull \
+  if (string == NULL) {                                                 \
+    g_set_error (error, DCONF_ERROR, DCONF_ERROR_PATH,                  \
+                 "%s not specified", type);                             \
+    return FALSE;                                                       \
+  }
+
+
 #define absolute \
   if ((l = *string++) != '/')                                           \
     {                                                                   \
@@ -111,7 +119,7 @@ dconf_is_path (const gchar  *string,
                GError      **error)
 {
 #define type "path"
-  vars; absolute; no_double_slash; path;
+  vars; nonnull; absolute; no_double_slash; path;
 #undef type
 }
 
@@ -136,7 +144,7 @@ dconf_is_key (const gchar *string,
               GError      **error)
 {
 #define type "key"
-  vars; absolute; no_double_slash; key;
+  vars; nonnull; absolute; no_double_slash; key;
 #undef type
 }
 
@@ -162,7 +170,7 @@ dconf_is_dir (const gchar  *string,
               GError      **error)
 {
 #define type "dir"
-  vars; absolute; no_double_slash; dir;
+  vars; nonnull; absolute; no_double_slash; dir;
 #undef type
 }
 
@@ -184,7 +192,7 @@ dconf_is_rel (const gchar  *string,
               GError      **error)
 {
 #define type "relative path"
-  vars; relative; no_double_slash; path;
+  vars; nonnull; relative; no_double_slash; path;
 #undef type
 }
 
@@ -209,7 +217,7 @@ dconf_is_rel_key (const gchar  *string,
                   GError      **error)
 {
 #define type "relative key"
-  vars; relative; no_double_slash; key;
+  vars; nonnull; relative; no_double_slash; key;
 #undef type
 }
 
@@ -235,6 +243,6 @@ dconf_is_rel_dir (const gchar  *string,
                   GError      **error)
 {
 #define type "relative dir"
-  vars; relative; no_double_slash; dir;
+  vars; nonnull; relative; no_double_slash; dir;
 #undef type
 }