1 files changed, 42 insertions, 41 deletions

diff --git a/src/plugins/mime_extractor.c b/src/plugins/mime_extractor.c
index b9fb3cf..cfcfab9 100644
--- a/src/plugins/mime_extractor.c
+++ b/src/plugins/mime_extractor.c
@@ -36,7 +36,7 @@ static magic_t magic;
  * Path we used for loading magic data, NULL is used for 'default'.
  */
 static char *magic_path;
- 
+
 
 /**
  * Main entry method for the 'application/ogg' extraction plugin.  The
@@ -54,74 +54,75 @@ EXTRACTOR_mime_extract_method (struct EXTRACTOR_ExtractContext *ec)
   const char *mime;
 
   ret = ec->read (ec->cls,
-                  &buf,
-                  16 * 1024);
+                  &buf,
+                  16 * 1024);
   if (-1 == ret)
     return;
   if ( ( (NULL == magic_path) &&
-         (NULL != ec->config) ) ||
+         (NULL != ec->config) ) ||
        ( (NULL != magic_path) &&
-         (NULL == ec->config) ) ||
+         (NULL == ec->config) ) ||
        ( (NULL != magic_path) &&
-         (NULL != ec->config) &&
-         (0 != strcmp (magic_path,
-                       ec->config) )) )
+         (NULL != ec->config) &&
+         (0 != strcmp (magic_path,
+                       ec->config) )) )
+  {
+    if (NULL != magic_path)
+      free (magic_path);
+    magic_close (magic);
+    magic = magic_open (MAGIC_MIME_TYPE);
+    if (0 != magic_load (magic, ec->config))
     {
-      if (NULL != magic_path)
-        free (magic_path);              
-      magic_close (magic);
-      magic = magic_open (MAGIC_MIME_TYPE);
-      if (0 != magic_load (magic, ec->config))
-        {
-          /* FIXME: report errors? */
-        }
-      if (NULL != ec->config)
-        magic_path = strdup (ec->config);
-      else
-        magic_path = NULL;
+      /* FIXME: report errors? */
     }
+    if (NULL != ec->config)
+      magic_path = strdup (ec->config);
+    else
+      magic_path = NULL;
+  }
   if (NULL == (mime = magic_buffer (magic, buf, ret)))
     return;
   ec->proc (ec->cls,
-            "mime",
-            EXTRACTOR_METATYPE_MIMETYPE,
-            EXTRACTOR_METAFORMAT_UTF8,
-            "text/plain",
-            mime,
-            strlen (mime) + 1);
+            "mime",
+            EXTRACTOR_METATYPE_MIMETYPE,
+            EXTRACTOR_METAFORMAT_UTF8,
+            "text/plain",
+            mime,
+            strlen (mime) + 1);
 }
 
 
 /**
  * Constructor for the library.  Loads the magic file.
  */
-void __attribute__ ((constructor)) 
-mime_ltdl_init () 
+void __attribute__ ((constructor))
+mime_ltdl_init ()
 {
   magic = magic_open (MAGIC_MIME_TYPE);
   if (0 != magic_load (magic, magic_path))
-    {
-      /* FIXME: how to deal with errors? */
-    }
+  {
+    /* FIXME: how to deal with errors? */
+  }
 }
 
 
 /**
  * Destructor for the library, cleans up.
  */
-void __attribute__ ((destructor)) 
-mime_ltdl_fini () 
+void __attribute__ ((destructor))
+mime_ltdl_fini ()
 {
   if (NULL != magic)
-    {
-      magic_close (magic);
-      magic = NULL;
-    }
+  {
+    magic_close (magic);
+    magic = NULL;
+  }
   if (NULL != magic_path)
-    {
-      free (magic_path);
-      magic_path = NULL;
-    }
+  {
+    free (magic_path);
+    magic_path = NULL;
+  }
 }
 
+
 /* end of mime_extractor.c */