diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-10 02:38:32 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-10 02:38:32 +0100 |
commit | 9f466ede8c667284e2747827d0f078cf5851521b (patch) | |
tree | a74f9f77c40b45e7abed93a6763a21b4875e7671 /src/fs | |
parent | 6037291cd4f4ead8719325632b7e00e163a59cb9 (diff) | |
download | gnunet-9f466ede8c667284e2747827d0f078cf5851521b.tar.gz gnunet-9f466ede8c667284e2747827d0f078cf5851521b.zip |
remove empty files, fix indentation
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_search.c | 26 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 1 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_lc.c | 33 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_lc.h | 33 |
4 files changed, 15 insertions, 78 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index af0b551ef..01e65ed57 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -1669,8 +1669,8 @@ search_result_stop (void *cls, | |||
1669 | if (NULL != sr->download) | 1669 | if (NULL != sr->download) |
1670 | { | 1670 | { |
1671 | sr->download->search = NULL; | 1671 | sr->download->search = NULL; |
1672 | sr->download->top = | 1672 | sr->download->top |
1673 | GNUNET_FS_make_top (sr->download->h, | 1673 | = GNUNET_FS_make_top (sr->download->h, |
1674 | &GNUNET_FS_download_signal_suspend_, | 1674 | &GNUNET_FS_download_signal_suspend_, |
1675 | sr->download); | 1675 | sr->download); |
1676 | if (NULL != sr->download->serialization) | 1676 | if (NULL != sr->download->serialization) |
@@ -1682,7 +1682,8 @@ search_result_stop (void *cls, | |||
1682 | sr->download->serialization = NULL; | 1682 | sr->download->serialization = NULL; |
1683 | } | 1683 | } |
1684 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT; | 1684 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT; |
1685 | GNUNET_FS_download_make_status_ (&pi, sr->download); | 1685 | GNUNET_FS_download_make_status_ (&pi, |
1686 | sr->download); | ||
1686 | GNUNET_FS_download_sync_ (sr->download); | 1687 | GNUNET_FS_download_sync_ (sr->download); |
1687 | sr->download = NULL; | 1688 | sr->download = NULL; |
1688 | } | 1689 | } |
@@ -1748,25 +1749,28 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc) | |||
1748 | if (NULL != sc->top) | 1749 | if (NULL != sc->top) |
1749 | GNUNET_FS_end_top (sc->h, sc->top); | 1750 | GNUNET_FS_end_top (sc->h, sc->top); |
1750 | GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, | 1751 | GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, |
1751 | &search_result_stop, sc); | 1752 | &search_result_stop, |
1753 | sc); | ||
1752 | if (NULL != sc->psearch_result) | 1754 | if (NULL != sc->psearch_result) |
1753 | sc->psearch_result->update_search = NULL; | 1755 | sc->psearch_result->update_search = NULL; |
1754 | if (NULL != sc->serialization) | 1756 | if (NULL != sc->serialization) |
1755 | { | 1757 | { |
1756 | GNUNET_FS_remove_sync_file_ (sc->h, | 1758 | GNUNET_FS_remove_sync_file_ (sc->h, |
1757 | (sc->psearch_result != | 1759 | (NULL != sc->psearch_result) |
1758 | NULL) ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH : | 1760 | ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH |
1759 | GNUNET_FS_SYNC_PATH_MASTER_SEARCH, | 1761 | : GNUNET_FS_SYNC_PATH_MASTER_SEARCH, |
1760 | sc->serialization); | 1762 | sc->serialization); |
1761 | GNUNET_FS_remove_sync_dir_ (sc->h, | 1763 | GNUNET_FS_remove_sync_dir_ (sc->h, |
1762 | (sc->psearch_result != | 1764 | (NULL != sc->psearch_result) |
1763 | NULL) ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH : | 1765 | ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH |
1764 | GNUNET_FS_SYNC_PATH_MASTER_SEARCH, | 1766 | : GNUNET_FS_SYNC_PATH_MASTER_SEARCH, |
1765 | sc->serialization); | 1767 | sc->serialization); |
1766 | GNUNET_free (sc->serialization); | 1768 | GNUNET_free (sc->serialization); |
1767 | } | 1769 | } |
1768 | pi.status = GNUNET_FS_STATUS_SEARCH_STOPPED; | 1770 | pi.status = GNUNET_FS_STATUS_SEARCH_STOPPED; |
1769 | sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc); | 1771 | sc->client_info = GNUNET_FS_search_make_status_ (&pi, |
1772 | sc->h, | ||
1773 | sc); | ||
1770 | GNUNET_break (NULL == sc->client_info); | 1774 | GNUNET_break (NULL == sc->client_info); |
1771 | if (NULL != sc->task) | 1775 | if (NULL != sc->task) |
1772 | { | 1776 | { |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 256d0c2b8..09b1e05d8 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include "gnunet_util_lib.h" | 38 | #include "gnunet_util_lib.h" |
39 | #include "gnunet-service-fs_cp.h" | 39 | #include "gnunet-service-fs_cp.h" |
40 | #include "gnunet-service-fs_indexing.h" | 40 | #include "gnunet-service-fs_indexing.h" |
41 | #include "gnunet-service-fs_lc.h" | ||
42 | #include "gnunet-service-fs_pe.h" | 41 | #include "gnunet-service-fs_pe.h" |
43 | #include "gnunet-service-fs_pr.h" | 42 | #include "gnunet-service-fs_pr.h" |
44 | #include "gnunet-service-fs_push.h" | 43 | #include "gnunet-service-fs_push.h" |
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c deleted file mode 100644 index 9ffd6cadd..000000000 --- a/src/fs/gnunet-service-fs_lc.c +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | Copyright (C) 2011 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
18 | Boston, MA 02110-1301, USA. | ||
19 | */ | ||
20 | /** | ||
21 | * @file fs/gnunet-service-fs_lc.c | ||
22 | * @brief API to handle 'local clients' | ||
23 | * @author Christian Grothoff | ||
24 | */ | ||
25 | #include "platform.h" | ||
26 | #include "gnunet-service-fs.h" | ||
27 | #include "gnunet-service-fs_lc.h" | ||
28 | #include "gnunet-service-fs_cp.h" | ||
29 | #include "gnunet-service-fs_pr.h" | ||
30 | |||
31 | |||
32 | |||
33 | /* end of gnunet-service-fs_lc.c */ | ||
diff --git a/src/fs/gnunet-service-fs_lc.h b/src/fs/gnunet-service-fs_lc.h deleted file mode 100644 index 6671ed33c..000000000 --- a/src/fs/gnunet-service-fs_lc.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | Copyright (C) 2011 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
18 | Boston, MA 02110-1301, USA. | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file fs/gnunet-service-fs_lc.h | ||
23 | * @brief API to handle 'local clients' | ||
24 | * @author Christian Grothoff | ||
25 | */ | ||
26 | #ifndef GNUNET_SERVICE_FS_LC_H | ||
27 | #define GNUNET_SERVICE_FS_LC_H | ||
28 | |||
29 | #include "gnunet-service-fs.h" | ||
30 | |||
31 | |||
32 | #endif | ||
33 | /* end of gnunet-service-fs_lc.h */ | ||