Changed logging callback system to set default when registering NULL for callback and to turn off one should use LOG_OFF git-svn-id: http://liblouis.googlecode.com/svn/trunk@1155 24698d54-e344-0410-af24-25bd253c2c7b

diff --git a/liblouis/compileTranslationTable.c b/liblouis/compileTranslationTable.c
index 9571503..777a7c0 100644
--- a/liblouis/compileTranslationTable.c
+++ b/liblouis/compileTranslationTable.c

@@ -5171,16 +5171,18 @@
 static logcallback logCallbackFunction = defaultLogCallback;
 void EXPORT_CALL lou_registerLogCallback(logcallback callback)
 {
+  if (callback == 0)
+    logCallbackFunction = defaultLogCallback;
   logCallbackFunction = callback;
 }
 
-static int logLevel = LOG_INFO;
-void EXPORT_CALL lou_setLogLevel(int level)
+static logLevels logLevel = LOG_INFO;
+void EXPORT_CALL lou_setLogLevel(logLevels level)
 {
   logLevel = level;
 }
 
-void EXPORT_CALL lou_log(int level, const char *format, ...)
+void EXPORT_CALL lou_log(logLevels level, const char *format, ...)
 {
   if (format == NULL)
       return;
@@ -5205,11 +5207,6 @@
     }
 }
 
-void EXPORT_CALL lou_setDefaultLogCallback()
-{
-  logCallbackFunction = defaultLogCallback;
-}
-
 void logWidecharBuf(int level, const char *msg, widechar *wbuf, int wlen)
 {
   int logBufSize = (wlen * ((sizeof(widechar) * 2) + 3)) + 1 + strlen(msg);

diff --git a/liblouis/liblouis.h.in b/liblouis/liblouis.h.in
index 2f80a42..c3cb9e9 100644
--- a/liblouis/liblouis.h.in
+++ b/liblouis/liblouis.h.in

@@ -155,7 +155,9 @@
 
 typedef void (*logcallback)(int level, const char *message);
   void EXPORT_CALL lou_registerLogCallback(logcallback callback);
-/* Register logging callbacks */
+/* Register logging callbacks
+ * Set to NULL for default callback.
+ */
 
   typedef enum
   {
@@ -167,9 +169,9 @@
     LOG_FATAL = 50000,
     LOG_OFF = 2147483647
   } logLevels;
-  void EXPORT_CALL lou_setLogLevel(int level);
-  void EXPORT_CALL lou_setDefaultCallback();
-  void EXPORT_CALL lou_log(int level, const char *format, ...);
+  void EXPORT_CALL lou_setLogLevel(logLevels level);
+
+  void EXPORT_CALL lou_log(logLevels level, const char *format, ...);
 /* General log function for callback logging */
 
   void EXPORT_CALL lou_free ();