[GNUnet-SVN] r5860 - in Extractor: . src/main src/plugins/ole2

[gnunet]

Author: grothoff
Date: 2007-12-10 17:28:26 -0700 (Mon, 10 Dec 2007)
New Revision: 5860

Modified:
   Extractor/ChangeLog
   Extractor/src/main/extract.c
   Extractor/src/plugins/ole2/ole2extractor.c
Log:
better logging -- see Debian #446841

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2007-12-11 00:10:25 UTC (rev 5859)
+++ Extractor/ChangeLog 2007-12-11 00:28:26 UTC (rev 5860)
@@ -1,3 +1,6 @@
+Mon Dec 10 17:27:28 MST 2007
+       Disable libgsf logging (for corrupt files).
+
 Sun Jul 29 02:30:40 MDT 2007
        Added escape (\n) handling to split extractor.
 

Modified: Extractor/src/main/extract.c
===================================================================
--- Extractor/src/main/extract.c        2007-12-11 00:10:25 UTC (rev 5859)
+++ Extractor/src/main/extract.c        2007-12-11 00:28:26 UTC (rev 5860)
@@ -619,6 +619,7 @@
 #ifdef MINGW
                ShutdownWinEnv();
 #endif
+      free (print);
       return -1;
     }
 

Modified: Extractor/src/plugins/ole2/ole2extractor.c
===================================================================
--- Extractor/src/plugins/ole2/ole2extractor.c  2007-12-11 00:10:25 UTC (rev 
5859)
+++ Extractor/src/plugins/ole2/ole2extractor.c  2007-12-11 00:28:26 UTC (rev 
5860)
@@ -555,12 +555,19 @@
 
   return prev;
 }
+static void nolog (const gchar *log_domain,
+                  GLogLevelFlags log_level,
+                  const gchar *message,
+                  gpointer user_data) {
+}
 
 void __attribute__ ((constructor)) ole2_ltdl_init() {
  g_type_init();
 #ifdef HAVE_GSF_INIT
   gsf_init();
 #endif
+  /* disable logging -- thanks, Jody! */
+  g_log_set_handler ("libgsf:msole", G_LOG_LEVEL_CRITICAL | 
G_LOG_LEVEL_WARNING,  &nolog, NULL);
   // gsf_init_dynamic(NULL);
 }