[GNUnet-SVN] r35545 - Extractor/src/plugins

[gnunet]

Author: LRN
Date: 2015-04-21 17:52:12 +0200 (Tue, 21 Apr 2015)
New Revision: 35545

Modified:
   Extractor/src/plugins/archive_extractor.c
Log:
Only use deprecated libarchive functions with old libarchive

Modified: Extractor/src/plugins/archive_extractor.c
===================================================================
--- Extractor/src/plugins/archive_extractor.c   2015-04-21 15:52:09 UTC (rev 
35544)
+++ Extractor/src/plugins/archive_extractor.c   2015-04-21 15:52:12 UTC (rev 
35545)
@@ -99,7 +99,11 @@
 
   format = NULL;
   a = archive_read_new ();
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+  archive_read_support_filter_all (a);
+#else
   archive_read_support_compression_all (a);
+#endif
   archive_read_support_format_all (a);
   if(archive_read_open2 (a, ec, NULL, &read_cb, &skip_cb, NULL)!= ARCHIVE_OK)
        return;
@@ -118,7 +122,11 @@
                         s, strlen (s) + 1))
        break;
     }
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+  archive_read_free (a);
+#else
   archive_read_finish (a);
+#endif
   if (NULL != format)
     {
       if (0 != ec->proc (ec->cls,