aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2022-12-05 13:15:09 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2022-12-05 13:15:09 +0900
commit6ccf51adc80cdb818416971cfd8ba82084571299 (patch)
tree969e4715caf2057613a96f175302c16a0c7c7206 /src/fs
parent8fd3a06ccdee5319d9a3b6d42201e879375bbb2a (diff)
downloadgnunet-6ccf51adc80cdb818416971cfd8ba82084571299.tar.gz
gnunet-6ccf51adc80cdb818416971cfd8ba82084571299.zip
BUILD: Improve extractor handling. Removed platform.h from include
Extractor is not properly detected and GNUNET_FS_EXTRACTOR_ENABLED added to gnunet_config.h. platform.h is removed from $PREFIX/include as it must not be included by third parties anyway.
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/fs.h2
-rw-r--r--src/fs/fs_api.c2
-rw-r--r--src/fs/fs_api.h2
-rw-r--r--src/fs/fs_directory.c2
-rw-r--r--src/fs/fs_dirmetascan.c2
-rw-r--r--src/fs/fs_download.c2
-rw-r--r--src/fs/fs_getopt.c2
-rw-r--r--src/fs/fs_list_indexed.c2
-rw-r--r--src/fs/fs_misc.c2
-rw-r--r--src/fs/fs_namespace.c2
-rw-r--r--src/fs/fs_publish.c2
-rw-r--r--src/fs/fs_publish_ksk.c2
-rw-r--r--src/fs/fs_publish_ublock.h2
-rw-r--r--src/fs/fs_search.c2
-rw-r--r--src/fs/fs_sharetree.c2
-rw-r--r--src/fs/fs_unindex.c2
-rw-r--r--src/fs/fs_uri.c2
-rw-r--r--src/fs/gnunet-daemon-fsprofiler.c2
-rw-r--r--src/fs/gnunet-directory.c2
-rw-r--r--src/fs/gnunet-download.c2
-rw-r--r--src/fs/gnunet-fs.c2
-rw-r--r--src/fs/gnunet-helper-fs-publish.c2
-rw-r--r--src/fs/gnunet-publish.c2
-rw-r--r--src/fs/gnunet-search.c2
-rw-r--r--src/fs/gnunet-unindex.c2
-rw-r--r--src/fs/meta_data.c2
-rw-r--r--src/fs/plugin_block_fs.c2
-rw-r--r--src/fs/test_fs_meta_data.c2
28 files changed, 28 insertions, 28 deletions
diff --git a/src/fs/fs.h b/src/fs/fs.h
index 920cf27b2..c3bae65d2 100644
--- a/src/fs/fs.h
+++ b/src/fs/fs.h
@@ -29,7 +29,7 @@
29#include "gnunet_constants.h" 29#include "gnunet_constants.h"
30#include "gnunet_datastore_service.h" 30#include "gnunet_datastore_service.h"
31#include "gnunet_dht_service.h" 31#include "gnunet_dht_service.h"
32#include "gnunet_extractor_compat.h" 32
33#include "gnunet_fs_service.h" 33#include "gnunet_fs_service.h"
34#include "gnunet_block_lib.h" 34#include "gnunet_block_lib.h"
35#include "block_fs.h" 35#include "block_fs.h"
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index c786d660c..627c58004 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -26,7 +26,7 @@
26 26
27#include "platform.h" 27#include "platform.h"
28#include "gnunet_util_lib.h" 28#include "gnunet_util_lib.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31#include "fs_api.h" 31#include "fs_api.h"
32#include "fs_tree.h" 32#include "fs_tree.h"
diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
index 9c9ce0f24..fdda91928 100644
--- a/src/fs/fs_api.h
+++ b/src/fs/fs_api.h
@@ -29,7 +29,7 @@
29#include "gnunet_constants.h" 29#include "gnunet_constants.h"
30#include "gnunet_datastore_service.h" 30#include "gnunet_datastore_service.h"
31#include "gnunet_dht_service.h" 31#include "gnunet_dht_service.h"
32#include "gnunet_extractor_compat.h" 32
33#include "gnunet_fs_service.h" 33#include "gnunet_fs_service.h"
34#include "gnunet_block_lib.h" 34#include "gnunet_block_lib.h"
35#include "block_fs.h" 35#include "block_fs.h"
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index e53b2dc11..c693f9216 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -33,7 +33,7 @@
33 * into memory 33 * into memory
34 */ 34 */
35#include "platform.h" 35#include "platform.h"
36#include "gnunet_extractor_compat.h" 36
37#include "gnunet_fs_service.h" 37#include "gnunet_fs_service.h"
38#include "fs_api.h" 38#include "fs_api.h"
39 39
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 3990a2521..2379e29ce 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -26,7 +26,7 @@
26 * @author Christian Grothoff 26 * @author Christian Grothoff
27 */ 27 */
28#include "platform.h" 28#include "platform.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31#include "gnunet_scheduler_lib.h" 31#include "gnunet_scheduler_lib.h"
32#include <pthread.h> 32#include <pthread.h>
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 73e12acb1..2a21e4810 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -24,7 +24,7 @@
24 */ 24 */
25#include "platform.h" 25#include "platform.h"
26#include "gnunet_constants.h" 26#include "gnunet_constants.h"
27#include "gnunet_extractor_compat.h" 27
28#include "gnunet_fs_service.h" 28#include "gnunet_fs_service.h"
29#include "fs_api.h" 29#include "fs_api.h"
30#include "fs_tree.h" 30#include "fs_tree.h"
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c
index 186963bba..0135e2e05 100644
--- a/src/fs/fs_getopt.c
+++ b/src/fs/fs_getopt.c
@@ -24,7 +24,7 @@
24 * @author Igor Wronsky, Christian Grothoff 24 * @author Igor Wronsky, Christian Grothoff
25 */ 25 */
26#include "platform.h" 26#include "platform.h"
27#include "gnunet_extractor_compat.h" 27
28#include "gnunet_fs_service.h" 28#include "gnunet_fs_service.h"
29#include "fs_api.h" 29#include "fs_api.h"
30 30
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 7d30933dd..78816cad1 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -26,7 +26,7 @@
26 26
27#include "platform.h" 27#include "platform.h"
28#include "gnunet_constants.h" 28#include "gnunet_constants.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31#include "gnunet_protocols.h" 31#include "gnunet_protocols.h"
32#include "fs_api.h" 32#include "fs_api.h"
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c
index 3ae82a82e..a8e23f042 100644
--- a/src/fs/fs_misc.c
+++ b/src/fs/fs_misc.c
@@ -24,7 +24,7 @@
24 */ 24 */
25#include "platform.h" 25#include "platform.h"
26#include "gnunet_constants.h" 26#include "gnunet_constants.h"
27#include "gnunet_extractor_compat.h" 27
28#include "gnunet_fs_service.h" 28#include "gnunet_fs_service.h"
29#include "fs_api.h" 29#include "fs_api.h"
30 30
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index b3eeeb23c..f8b7b91c0 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -28,7 +28,7 @@
28#include "gnunet_constants.h" 28#include "gnunet_constants.h"
29#include "gnunet_signatures.h" 29#include "gnunet_signatures.h"
30#include "gnunet_util_lib.h" 30#include "gnunet_util_lib.h"
31#include "gnunet_extractor_compat.h" 31
32#include "gnunet_fs_service.h" 32#include "gnunet_fs_service.h"
33#include "fs_api.h" 33#include "fs_api.h"
34#include "fs_publish_ublock.h" 34#include "fs_publish_ublock.h"
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index bd533fcfb..d1662c78b 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -28,7 +28,7 @@
28#include "gnunet_constants.h" 28#include "gnunet_constants.h"
29#include "gnunet_signatures.h" 29#include "gnunet_signatures.h"
30#include "gnunet_util_lib.h" 30#include "gnunet_util_lib.h"
31#include "gnunet_extractor_compat.h" 31
32#include "gnunet_fs_service.h" 32#include "gnunet_fs_service.h"
33#include "fs_api.h" 33#include "fs_api.h"
34#include "fs_tree.h" 34#include "fs_tree.h"
diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index d8ea22da2..3981ad335 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -30,7 +30,7 @@
30#include "gnunet_constants.h" 30#include "gnunet_constants.h"
31#include "gnunet_signatures.h" 31#include "gnunet_signatures.h"
32#include "gnunet_util_lib.h" 32#include "gnunet_util_lib.h"
33#include "gnunet_extractor_compat.h" 33
34#include "gnunet_fs_service.h" 34#include "gnunet_fs_service.h"
35#include "fs_api.h" 35#include "fs_api.h"
36#include "fs_tree.h" 36#include "fs_tree.h"
diff --git a/src/fs/fs_publish_ublock.h b/src/fs/fs_publish_ublock.h
index 991926444..4adffc6c1 100644
--- a/src/fs/fs_publish_ublock.h
+++ b/src/fs/fs_publish_ublock.h
@@ -30,7 +30,7 @@
30 30
31#include "gnunet_util_lib.h" 31#include "gnunet_util_lib.h"
32#include "gnunet_datastore_service.h" 32#include "gnunet_datastore_service.h"
33#include "gnunet_extractor_compat.h" 33
34#include "gnunet_fs_service.h" 34#include "gnunet_fs_service.h"
35#include "gnunet_identity_service.h" 35#include "gnunet_identity_service.h"
36 36
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 975dcfb14..823f046ed 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -24,7 +24,7 @@
24 */ 24 */
25#include "platform.h" 25#include "platform.h"
26#include "gnunet_constants.h" 26#include "gnunet_constants.h"
27#include "gnunet_extractor_compat.h" 27
28#include "gnunet_fs_service.h" 28#include "gnunet_fs_service.h"
29#include "gnunet_protocols.h" 29#include "gnunet_protocols.h"
30#include "fs_api.h" 30#include "fs_api.h"
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index a09b3589d..6c246a3ad 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -25,7 +25,7 @@
25 * @author Christian Grothoff 25 * @author Christian Grothoff
26 */ 26 */
27#include "platform.h" 27#include "platform.h"
28#include "gnunet_extractor_compat.h" 28
29#include "gnunet_fs_service.h" 29#include "gnunet_fs_service.h"
30#include "gnunet_scheduler_lib.h" 30#include "gnunet_scheduler_lib.h"
31#include <pthread.h> 31#include <pthread.h>
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 6031d7bc3..68ba667c4 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -26,7 +26,7 @@
26 */ 26 */
27#include "platform.h" 27#include "platform.h"
28#include "gnunet_constants.h" 28#include "gnunet_constants.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31#include "gnunet_protocols.h" 31#include "gnunet_protocols.h"
32#include "fs_api.h" 32#include "fs_api.h"
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 0810f77ca..b0be0db4f 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -81,7 +81,7 @@
81 * 81 *
82 */ 82 */
83#include "platform.h" 83#include "platform.h"
84#include "gnunet_extractor_compat.h" 84
85#include "gnunet_fs_service.h" 85#include "gnunet_fs_service.h"
86#include "gnunet_signatures.h" 86#include "gnunet_signatures.h"
87#include "fs_api.h" 87#include "fs_api.h"
diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c
index bc7ca9521..b99933cfa 100644
--- a/src/fs/gnunet-daemon-fsprofiler.c
+++ b/src/fs/gnunet-daemon-fsprofiler.c
@@ -27,7 +27,7 @@
27 * - how to signal driver that we're done? 27 * - how to signal driver that we're done?
28 */ 28 */
29#include "platform.h" 29#include "platform.h"
30#include "gnunet_extractor_compat.h" 30
31#include "gnunet_fs_service.h" 31#include "gnunet_fs_service.h"
32#include "gnunet_statistics_service.h" 32#include "gnunet_statistics_service.h"
33 33
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index e720628b3..ab9f2905a 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -23,7 +23,7 @@
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "platform.h" 25#include "platform.h"
26#include "gnunet_extractor_compat.h" 26
27#include "gnunet_fs_service.h" 27#include "gnunet_fs_service.h"
28 28
29static int ret; 29static int ret;
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index f463f901e..4694077e9 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -26,7 +26,7 @@
26 * @author Igor Wronsky 26 * @author Igor Wronsky
27 */ 27 */
28#include "platform.h" 28#include "platform.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31 31
32static int ret; 32static int ret;
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c
index 3dd00c7dc..21e3c4a40 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -23,7 +23,7 @@
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "platform.h" 25#include "platform.h"
26#include "gnunet_extractor_compat.h" 26
27#include "gnunet_fs_service.h" 27#include "gnunet_fs_service.h"
28 28
29/** 29/**
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c
index b886280c9..0e07b79dc 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/fs/gnunet-helper-fs-publish.c
@@ -27,7 +27,7 @@
27 * and report the results to stdout. 27 * and report the results to stdout.
28 */ 28 */
29#include "platform.h" 29#include "platform.h"
30#include "gnunet_extractor_compat.h" 30
31#include "gnunet_fs_service.h" 31#include "gnunet_fs_service.h"
32 32
33 33
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 094cbc9b9..59f16210a 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -26,7 +26,7 @@
26 * @author Igor Wronsky 26 * @author Igor Wronsky
27 */ 27 */
28#include "platform.h" 28#include "platform.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31#include "gnunet_identity_service.h" 31#include "gnunet_identity_service.h"
32 32
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index b55602523..a72cf97cc 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -30,7 +30,7 @@
30#include <ctype.h> 30#include <ctype.h>
31#include <inttypes.h> 31#include <inttypes.h>
32#include <limits.h> 32#include <limits.h>
33#include "gnunet_extractor_compat.h" 33
34#include "gnunet_fs_service.h" 34#include "gnunet_fs_service.h"
35 35
36 36
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index 80cd95c19..326f75a63 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -26,7 +26,7 @@
26 * @author Igor Wronsky 26 * @author Igor Wronsky
27 */ 27 */
28#include "platform.h" 28#include "platform.h"
29#include "gnunet_extractor_compat.h" 29
30#include "gnunet_fs_service.h" 30#include "gnunet_fs_service.h"
31 31
32static int ret; 32static int ret;
diff --git a/src/fs/meta_data.c b/src/fs/meta_data.c
index f676ce57c..3e2857101 100644
--- a/src/fs/meta_data.c
+++ b/src/fs/meta_data.c
@@ -28,7 +28,7 @@
28 28
29#include "platform.h" 29#include "platform.h"
30#include "gnunet_util_lib.h" 30#include "gnunet_util_lib.h"
31#include "gnunet_extractor_compat.h" 31
32#include "gnunet_fs_service.h" 32#include "gnunet_fs_service.h"
33 33
34/** 34/**
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c
index a6cfb2e64..bbd0ff57b 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -25,7 +25,7 @@
25 */ 25 */
26#include "platform.h" 26#include "platform.h"
27#include "gnunet_block_plugin.h" 27#include "gnunet_block_plugin.h"
28#include "gnunet_extractor_compat.h" 28
29#include "gnunet_fs_service.h" 29#include "gnunet_fs_service.h"
30#include "block_fs.h" 30#include "block_fs.h"
31#include "gnunet_signatures.h" 31#include "gnunet_signatures.h"
diff --git a/src/fs/test_fs_meta_data.c b/src/fs/test_fs_meta_data.c
index 50f902cb5..bee7844ea 100644
--- a/src/fs/test_fs_meta_data.c
+++ b/src/fs/test_fs_meta_data.c
@@ -28,7 +28,7 @@
28 28
29#include "platform.h" 29#include "platform.h"
30#include "gnunet_util_lib.h" 30#include "gnunet_util_lib.h"
31#include "gnunet_extractor_compat.h" 31
32#include "gnunet_fs_service.h" 32#include "gnunet_fs_service.h"
33 33
34#define ABORT(m) { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \ 34#define ABORT(m) { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \