libextractor

commit 5eca41802c5ea014692365963a800850bdad161a
parent d1e0f7bd8895a31b51263bae5cbfa43461614fcd
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 11 Dec 2007 00:28:26 +0000

better logging -- see Debian #446841

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/main/extract.c
 | 
1
+
M
src/plugins/ole2/ole2extractor.c
 | 
7
+++++++

3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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.
 
diff --git a/src/main/extract.c b/src/main/extract.c
@@ -619,6 +619,7 @@ main (int argc, char *argv[])
 #ifdef MINGW
   		ShutdownWinEnv();
 #endif
+      free (print);
       return -1;
     }
 
diff --git a/src/plugins/ole2/ole2extractor.c b/src/plugins/ole2/ole2extractor.c
@@ -555,12 +555,19 @@ libextractor_ole2_extract(const char * filename,
 
   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);
 }