reducing error messages about missing configuration options by introducing new helper functions to print them uniformly

4 files changed, 15 insertions, 24 deletions

diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 29cef7472..af1200dc4 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -53,9 +53,8 @@ get_namespace_directory (struct GNUNET_FS_Handle *h)
       GNUNET_CONFIGURATION_get_value_filename (h->cfg, "FS", "IDENTITY_DIR",
                                                &dn))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Configuration fails to specify `%s' in section `%s'\n"),
-                "IDENTITY_DIR", "fs");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "fs", "IDENTITY_DIR");
     return NULL;
   }
   return dn;
@@ -79,9 +78,8 @@ get_update_information_directory (struct GNUNET_FS_Namespace *ns)
       GNUNET_CONFIGURATION_get_value_filename (ns->h->cfg, "FS", "UPDATE_DIR",
                                                &dn))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Configuration fails to specify `%s' in section `%s'\n"),
-                "UPDATE_DIR", "fs");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "fs", "UPDATE_DIR");
     return NULL;
   }
   GNUNET_asprintf (&ret, "%s%s%s", dn, DIR_SEPARATOR_STR, ns->name);
diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c
index 60dd1c131..7bd8316ab 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/fs/gnunet-service-fs_indexing.c
@@ -109,9 +109,8 @@ write_index_list ()
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg, "FS", "INDEXDB", &fn))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                _("Configuration option `%s' in section `%s' missing.\n"),
-                "INDEXDB", "FS");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                               "fs", "INDEXDB");
     return;
   }
   wh = GNUNET_BIO_write_open (fn);
@@ -159,9 +158,8 @@ read_index_list ()
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg, "FS", "INDEXDB", &fn))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                _("Configuration option `%s' in section `%s' missing.\n"),
-                "INDEXDB", "FS");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                               "fs", "INDEXDB");
     return;
   }
   if (GNUNET_NO == GNUNET_DISK_file_test (fn))
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index cbe5a3e24..72babdb05 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -1597,19 +1597,15 @@ GSF_pending_request_init_ ()
                                              "MAX_PENDING_REQUESTS",
                                              &max_pending_requests))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _
-                ("Configuration fails to specify `%s', assuming default value."),
-                "MAX_PENDING_REQUESTS");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_INFO,
+                               "fs", "MAX_PENDING_REQUESTS");
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "ats", "WAN_QUOTA_OUT",
                                            &bps))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _
-                ("Configuration fails to specify `%s', assuming default value."),
-                "WAN_QUOTA_OUT");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_INFO,
+                               "ats", "WAN_QUOTA_OUT");
     bps = 65536;
   }
   /* queue size should be #queries we can have pending and satisfy within
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index aaf7ca8a3..936cf5164 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -624,10 +624,9 @@ GSF_push_init_ ()
       GNUNET_CONFIGURATION_get_value_time (GSF_cfg, "fs", "MIN_MIGRATION_DELAY",
                                            &min_migration_delay))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _
-                ("Invalid value specified for option `%s' in section `%s', content pushing disabled\n"),
-                "MIN_MIGRATION_DELAY", "fs");
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+                               "fs", "MIN_MIGRATION_DELAY",
+                               _("time required, content pushing disabled"));
     return;
   }
   consider_gathering ();