[GNUnet-SVN] r37438 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2016-07-02 15:26:13 +0200 (Sat, 02 Jul 2016)
New Revision: 37438

Modified:
   gnunet/src/fs/fs_getopt.c
   gnunet/src/fs/gnunet-search.c
   gnunet/src/fs/test_fs_directory.c
Log:
-fix ftbfs if extractor.h present but libextractor.so missing

Modified: gnunet/src/fs/fs_getopt.c
===================================================================
--- gnunet/src/fs/fs_getopt.c   2016-07-02 13:21:22 UTC (rev 37437)
+++ gnunet/src/fs/fs_getopt.c   2016-07-02 13:26:13 UTC (rev 37438)
@@ -127,7 +127,7 @@
                                const char *value)
 {
   struct GNUNET_CONTAINER_MetaData **mm = scls;
-#if HAVE_EXTRACTOR_H
+#if HAVE_EXTRACTOR_H && HAVE_LIBEXTRACTOR
   enum EXTRACTOR_MetaType type;
   const char *typename;
   const char *typename_i18n;
@@ -147,7 +147,7 @@
    */
   /*tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), locale_charset ());*/
   tmp = GNUNET_strdup (value);
-#if HAVE_EXTRACTOR_H
+#if HAVE_EXTRACTOR_H && HAVE_LIBEXTRACTOR
   type = EXTRACTOR_metatype_get_max ();
   while (type > 0)
   {

Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c       2016-07-02 13:21:22 UTC (rev 37437)
+++ gnunet/src/fs/gnunet-search.c       2016-07-02 13:26:13 UTC (rev 37438)
@@ -72,13 +72,17 @@
  * @param data_mime_type mime-type of data (not of the original file);
  *        can be NULL (if mime-type is not known)
  * @param data actual meta-data found
- * @param data_size number of bytes in data
+ * @param data_size number of bytes in @a data
  * @return 0 to continue extracting, 1 to abort
  */
 static int
-item_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
-              enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
-              const char *data, size_t data_size)
+item_printer (void *cls,
+              const char *plugin_name,
+              enum EXTRACTOR_MetaType type,
+              enum EXTRACTOR_MetaFormat format,
+              const char *data_mime_type,
+              const char *data,
+              size_t data_size)
 {
   if ((format != EXTRACTOR_METAFORMAT_UTF8) &&
       (format != EXTRACTOR_METAFORMAT_C_STRING))

Modified: gnunet/src/fs/test_fs_directory.c
===================================================================
--- gnunet/src/fs/test_fs_directory.c   2016-07-02 13:21:22 UTC (rev 37437)
+++ gnunet/src/fs/test_fs_directory.c   2016-07-02 13:26:13 UTC (rev 37438)
@@ -99,7 +99,7 @@
     {
       GNUNET_snprintf (txt, sizeof (txt), "%u -- %u\n", p, q);
       GNUNET_CONTAINER_meta_data_insert (mds[p], "<test>",
-#if HAVE_EXTRACTOR_H
+#if HAVE_EXTRACTOR_H && HAVE_LIBEXTRACTOR
                                          q % EXTRACTOR_metatype_get_max (),
 #else
                                          q % 128,