X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fconfigfile.h;h=fec1cf4be6bd1965d9d056cc94534f039b7e1467;hb=ec6fec62b15992b22774233c6a915e46673b25af;hp=4f82eef1e55766ac61a0b8c94a5f2285a0c4c720;hpb=adb9c9339f6689f9d29e6d931812f7c99da52ad3;p=collectd.git

diff --git a/src/configfile.h b/src/configfile.h
index 4f82eef1..fec1cf4b 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -1,6 +1,6 @@
 /**
  * collectd - src/configfile.h
- * 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
@@ -31,7 +31,7 @@
  *  `type'      Name of the plugin (must be the same as passed to
  *              `plugin_register'
  */
-void cf_unregister (char *type);
+void cf_unregister (const char *type);
 
 /*
  * DESCRIPTION
@@ -57,23 +57,24 @@ void cf_unregister (char *type);
  *  exists for each `type' at any time. This means that `cf_register' may be
  *  called multiple times, but only the last call will have an effect.
  */
-void cf_register (char *type,
-		int (*callback) (char *, char *),
-		char **keys, int keys_num);
+void cf_register (const char *type,
+		int (*callback) (const char *, const char *),
+		const char **keys, int keys_num);
 
 /*
  * DESCRIPTION
- *  `cf_get_mode_option' returns options from the <Mode> section(s).
+ *  `cf_get_option' returns various general options.
  *
  * PARAMETERS
  *  `key'       Name of the option to query.
+ *  `def'       Pointer to return as default value.
  *
  * RETURN VALUE
  *  The pointer returned is part of an internal structure and may not be
  *  changed. If the option is not found for whatever reason (wrong key, option
  *  not allowed for currently selected mode, ...) `NULL' is returned.
  */
-char *cf_get_mode_option (const char *key);
+char *cf_get_option (const char *key, char *def);
 
 /*
  * DESCRIPTION
@@ -81,6 +82,11 @@ char *cf_get_mode_option (const char *key);
  *  information to functions/variables. Most important: Is calls `plugin_load'
  *  to load specific plugins, depending on the current mode of operation.
  *
+ * PARAMETERS
+ *  `filename'  An additional filename to look for. This function calls
+ *              `lc_process' which already searches many standard locations..
+ *              If set to NULL will use the `CONFIGFILE' define.
+ *
  * RETURN VALUE
  *  Returns zero upon success and non-zero otherwise. A error-message will have
  *  been printed in this case.