Moved sdb_proto_send/sdb_proto_select to sdb_write/sdb_select.

[sysdb.git] / src / include / utils / error.h

diff --git a/src/include/utils/error.h b/src/include/utils/error.h
index 487b6e4ffcaa98dffd1202e5667c102fdfcd960e..49034eb2544381061583c33d4174e9fb9089e80e 100644 (file)
--- a/src/include/utils/error.h
+++ b/src/include/utils/error.h
@@ -31,25 +31,19 @@
  * will use its own memory region to store information about the last reported
  * error.
  * Once the error message has been passed to SysDB, it will log the entire
- * message at once. XXX: currently, SysDB only supports printing the error to
- * the standard error channel; support for other logging backends will be
- * added later in a modular fashion.
+ * message at once. The message will be sent to all registered log functions.
  */
 
 #ifndef SDB_UTILS_ERROR_H
 #define SDB_UTILS_ERROR_H 1
 
+#include <stdarg.h>
 #include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* max length of any error message */
-#ifndef SDB_MAX_ERROR
-#      define SDB_MAX_ERROR 4096
-#endif /* ! SDB_MAX_ERROR */
-
 /* On Linux systems and possibly others, this should be the same as the LOG_
  * constants defined by syslog. */
 enum {
@@ -69,7 +63,16 @@ enum {
                : ((prio) == SDB_LOG_DEBUG) ? "DEBUG" : "UNKNOWN")
 
 /*
- * sdb_log:
+ * sdb_error_set_logger:
+ * Set the logging callback to be used for logging messages. By default (or
+ * when explicitely setting the logger to NULL), logs will be written to the
+ * stderr channel.
+ */
+void
+sdb_error_set_logger(int (*f)(int, const char *));
+
+/*
+ * sdb_log, sdb_vlog:
  * Log the specified message. The string will be formatted in printf-style
  * using the specified format and arguments and logged with the specified
  * priority. In addition, the error message will be stored as the current
@@ -78,7 +81,10 @@ enum {
  * on configuration, try a clean shut-down of the process.
  */
 int
-sdb_log(int prio, const char *fmt, ...);
+sdb_log(int prio, const char *fmt, ...)
+               __attribute__((format(printf, 2, 3)));
+int
+sdb_vlog(int prio, const char *fmt, va_list ap);
 
 /*
  * sdb_error_set, sdb_error_append:
@@ -87,9 +93,18 @@ sdb_log(int prio, const char *fmt, ...);
  * be done.
  */
 int
-sdb_error_set(const char *fmt, ...);
+sdb_error_set(const char *fmt, ...)
+               __attribute__((format(printf, 1, 2)));
+int
+sdb_error_append(const char *fmt, ...)
+               __attribute__((format(printf, 1, 2)));
+
+/*
+ * sdb_error_chomp:
+ * Remove all consecutive newline characters at the end of the error message.
+ */
 int
-sdb_error_append(const char *fmt, ...);
+sdb_error_chomp(void);
 
 /*
  * sdb_error_log: