remove compile-time option to get configuration from LDAP

shared/configfile.h

@@ -1,14 +1,14 @@
-/*
- * configfile.h
- * This file is part of LCDd, the lcdproc server.
+/** \file configfile.h
+ * Declares routines to read INI-file like files.
+ */
+
+/* This file is part of LCDd, the lcdproc server.
  *
  * This file is released under the GNU General Public License. Refer to the
  * COPYING file distributed with this package.
  *
  * Copyright (c) 2001, Joris Robijn
- *
- *
- * Defines routines to read ini-file-like files.
+ *           (c) 2006,2007 Peter Marschall
  *
  */
 
@@ -19,52 +19,47 @@
 #include "config.h"
 #endif
 
-int config_read_file(const char *filename);
 /* Opens the specified file and reads everything into memory.
- * Returns -1 on parsing errors.
- * Returns -2 if the file could not be opened or a read error occured.
- * Returns -16 if a malloc went wrong.
+ * Returns 0  when config file was successfully parsed
+ * Returns <0 on errors
  */
+int config_read_file(const char *filename);
 
-int config_read_string(const char *sectionname, const char *str);
+#if defined(LCDPROC_CONFIG_READ_STRING)
 /* Reads everything in the string into memory.
- * Returns -1 on parsing errors.
- * Returns -16 if a malloc went wrong.
+ * Returns 0  when config file was successfully parsed
+ * Returns <0 on errors
  */
+int config_read_string(const char *sectionname, const char *str);
+#endif
 
-short config_get_bool(const char *sectionname, const char *keyname,
-		int skip, short default_value);
 /* Tries to interpret a value in the config file as a boolean.
- * 0, false, no, n = false
- * 1, true, yes, y = true
+ * 0, false, off, no, n = false
+ * 1, true, on, yes, y = true
  * If the key is not found or cannot be interpreted, the given default value is
  * returned.
  * The skip value can be used to iterate over multiple values with the same
  * key. Should be 0 to get the first one, 1 for the second etc. and -1 for the
  * last.
  */
+short config_get_bool(const char *sectionname, const char *keyname,
+		int skip, short default_value);
 
+/* Tries to interpret a value in the config file as an integer.*/
 long int config_get_int(const char *sectionname, const char *keyname,
 		int skip, long int default_value);
-/* Tries to interpret a value in the config file as an integer.*/
 
+/* Tries to interpret a value in the config file as a float.*/
 double config_get_float(const char *sectionname, const char *keyname,
 		int skip, double default_value);
-/* Tries to interpret a value in the config file as a float.*/
 
-const char *config_get_string(const char *sectionname, const char *keyname,
-		int skip, const char *default_value);
 /* Returns a pointer to the string associated with the specified key.
- * The string should never be modified, and used only short-term. You can
- * for example scan it or copy it. In successive calls this function can
- * re-use the data space !
+ * The strings returned are always NUL-terminated.
+ * The string should never be modified, and used only short-term. 
+ * In successive calls this function can * re-use the data space !
  *
- * found in a mail from Joris:
- *
- * The strings it returns are always terminated.
- *
- * You can do some things with them:
- * 1. Scan them:
+ * You can do some things with the returned string:
+ * 1. Scan or parse it:
  *    s = config_get_string(...);
  *    sscanf( s, "%dx%d", &w, &h );  // scan format like: 20x4
  *    ...and check the w and h values...
@@ -77,22 +72,23 @@ const char *config_get_string(const char *sectionname, const char *keyname,
  *    device = malloc(strlen(s)+1);
  *    if( device == NULL ) return -5; // or whatever < 0
  *    strcpy( device, s );
- * 
  */
+const char *config_get_string(const char *sectionname, const char *keyname,
+		int skip, const char *default_value);
 
-int config_has_section(const char *sectionname);
 /* Checks if a specified section exists.
  * Returns whether it exists.
  */
+int config_has_section(const char *sectionname);
 
-int config_has_key(const char *sectionname, const char *keyname);
 /* Checks if a specified key within the specified section exists.
  * Returns the number of times the key exists.
  */
+int config_has_key(const char *sectionname, const char *keyname);
 
-void config_clear();
 /* Clears all data stored by the config_read_* functions.
  * Should be called if the config should be reread.
  */
+void config_clear(void);
 
 #endif