X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=39265868eac9dfb3eee7e2c79221c5be2c92c4d2;hb=fa3e58be7ba5762f59f4f1b86cb6431cd4813a6a;hp=52978b39c2a43b57dd642f6b6713ae37aa9a4969;hpb=a2ba56ac2dcf2b8f42bff9c047eb8e1daa3dfda7;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 52978b39..39265868 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/configfile.c
- * Copyright (C) 2005  Florian octo Forster
+ * Copyright (C) 2005,2006  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -20,9 +20,6 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-/* TODO
- * make internal-only functions `static' */
-
 #include "collectd.h"
 
 #include "libconfig/libconfig.h"
@@ -40,11 +37,16 @@
 #define ERR_NEEDS_ARG "Section `%s' needs an argument.\n"
 #define ERR_NEEDS_SECTION "`%s' can only be used within a section.\n"
 
-#ifdef HAVE_LIBRRD
+#define ESCAPE_NULL(str) ((str) == NULL ? "(null)" : (str))
+
+#define DEBUG_CALLBACK(shortvar, var, arguments, value) \
+	DBG("shortvar = %s, var = %s, arguments = %s, value = %s, ...", \
+			ESCAPE_NULL(shortvar), \
+			ESCAPE_NULL(var), \
+			ESCAPE_NULL(arguments), \
+			ESCAPE_NULL(value))
+
 extern int operating_mode;
-#else
-static int operating_mode = MODE_CLIENT;
-#endif
 
 typedef struct cf_callback
 {
@@ -69,10 +71,10 @@ typedef struct cf_mode_item
  */
 static cf_mode_item_t cf_mode_list[] =
 {
-	{"MulticastTTL",NULL, MODE_CLIENT                           },
-	{"PIDFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
-	{"DataDir",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
-	{"LogFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL}
+	{"TimeToLive",  NULL, MODE_CLIENT                           },
+	{"PIDFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG },
+	{"DataDir",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG },
+	{"LogFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG }
 };
 static int cf_mode_num = 4;
 
@@ -80,14 +82,14 @@ static int nesting_depth = 0;
 static char *current_module = NULL;
 
 /* `cf_register' needs this prototype */
-int cf_callback_plugin_dispatch (const char *, const char *, const char *,
-		const char *, lc_flags_t, void *);
+static int cf_callback_plugin_dispatch (const char *, const char *,
+		const char *, const char *, lc_flags_t, void *);
 
 /*
  * Functions to handle register/unregister, search, and other plugin related
  * stuff
  */
-cf_callback_t *cf_search (char *type)
+static cf_callback_t *cf_search (char *type)
 {
 	cf_callback_t *cf_cb;
 
@@ -101,7 +103,7 @@ cf_callback_t *cf_search (char *type)
 	return (cf_cb);
 }
 
-int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
+static int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 {
 	cf_callback_t *cf_cb;
 	char *key;
@@ -109,11 +111,14 @@ int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 	int ret;
 	int i;
 
-	DBG ("type = %s, key = %s, value = %s", type, orig_key, orig_value);
+	DBG ("type = %s, key = %s, value = %s",
+			ESCAPE_NULL(type),
+			ESCAPE_NULL(orig_key),
+			ESCAPE_NULL(orig_value));
 
 	if ((cf_cb = cf_search (type)) == NULL)
 	{
-		syslog (LOG_WARNING, "Plugin `%s' did not register a callback.\n", type);
+		syslog (LOG_WARNING, "Plugin `%s' did not register a callback.", type);
 		return (-1);
 	}
 
@@ -137,11 +142,13 @@ int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 	}
 
 	if (i >= cf_cb->keys_num)
-		syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.\n", type, key);
+		syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.", type, key);
 
 	free (key);
 	free (value);
 
+	DBG ("return (%i)", ret);
+
 	return (ret);
 }
 
@@ -200,7 +207,7 @@ void cf_register (char *type,
 		}
 		else
 		{
-			DBG ("Key was truncated: `%s'", keys[i]);
+			DBG ("Key was truncated: `%s'", ESCAPE_NULL(keys[i]));
 		}
 	}
 }
@@ -238,19 +245,22 @@ char *cf_get_option (const char *key, char *def)
  *
  * Mode `value'
  */
-int cf_callback_mode (const char *shortvar, const char *var,
+static int cf_callback_mode (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	if (strcasecmp (value, "Client") == 0)
 		operating_mode = MODE_CLIENT;
+#if HAVE_LIBRRD
 	else if (strcasecmp (value, "Server") == 0)
 		operating_mode = MODE_SERVER;
 	else if (strcasecmp (value, "Local") == 0)
 		operating_mode = MODE_LOCAL;
+#endif
+	else if (strcasecmp (value, "Log") == 0)
+		operating_mode = MODE_LOG;
 	else
 	{
 		syslog (LOG_ERR, "Invalid value for config option `Mode': `%s'", value);
@@ -268,26 +278,24 @@ int cf_callback_mode (const char *shortvar, const char *var,
  *   PluginDir `value'
  * </Mode>
  */
-int cf_callback_mode_plugindir (const char *shortvar, const char *var,
+static int cf_callback_mode_plugindir (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	plugin_set_dir (value);
 
 	return (LC_CBRET_OKAY);
 }
 
-int cf_callback_mode_option (const char *shortvar, const char *var,
+static int cf_callback_mode_option (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
 	cf_mode_item_t *item;
 
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	if (extra == NULL)
 	{
@@ -332,12 +340,11 @@ int cf_callback_mode_option (const char *shortvar, const char *var,
  *   LoadPlugin `value'
  * </Mode>
  */
-int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
+static int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	if (plugin_load (value))
 		syslog (LOG_ERR, "plugin_load (%s): failed to load plugin", value);
@@ -347,37 +354,7 @@ int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
 	return (LC_CBRET_OKAY);
 }
 
-/*
- * `cf_callback_mode_switch'
- *   Change the contents of the global variable `operating_mode'
- *
- *   This should be command line options. One *can* do this in the config
- *   files, but I will not document this. Don't whine abount it not working as
- *   you expect if you do it anyways.
- */
-int cf_callback_mode_switch (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
-{
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
-
-	if (strcasecmp (shortvar, "Client") == 0)
-		operating_mode = MODE_CLIENT;
-	else if (strcasecmp (shortvar, "Local") == 0)
-		operating_mode = MODE_LOCAL;
-	else if (strcasecmp (shortvar, "Server") == 0)
-		operating_mode = MODE_SERVER;
-	else
-	{
-		fprintf (stderr, "cf_callback_mode_switch: Wrong mode!\n");
-		return (LC_CBRET_ERROR);
-	}
-
-	return (LC_CBRET_OKAY);
-}
-
-int cf_callback_socket (const char *shortvar, const char *var,
+static int cf_callback_socket (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
@@ -389,8 +366,7 @@ int cf_callback_socket (const char *shortvar, const char *var,
 	char *node;
 	char *service = NET_DEFAULT_PORT;
 
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	buffer = strdup (value);
 	if (buffer == NULL)
@@ -428,12 +404,11 @@ int cf_callback_socket (const char *shortvar, const char *var,
  *   ...
  * </Plugin>
  */
-int cf_callback_plugin (const char *shortvar, const char *var,
+static int cf_callback_plugin (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	if (flags == LC_FLAGS_SECTIONSTART)
 	{
@@ -489,12 +464,11 @@ int cf_callback_plugin (const char *shortvar, const char *var,
  *   `var' `value'
  * </Plugin>
  */
-int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
+static int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	if ((nesting_depth == 0) || (current_module == NULL))
 	{
@@ -509,7 +483,7 @@ int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
 	return (LC_CBRET_OKAY);
 }
 
-void cf_init (void)
+static void cf_init (void)
 {
 	static int run_once = 0;
 	int i;