From 9f466ede8c667284e2747827d0f078cf5851521b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 10 Mar 2017 02:38:32 +0100 Subject: remove empty files, fix indentation --- src/datastore/gnunet-service-datastore.c | 2 +- src/fs/fs_search.c | 26 ++++++++++++++----------- src/fs/gnunet-service-fs.c | 1 - src/fs/gnunet-service-fs_lc.c | 33 -------------------------------- src/fs/gnunet-service-fs_lc.h | 33 -------------------------------- 5 files changed, 16 insertions(+), 79 deletions(-) delete mode 100644 src/fs/gnunet-service-fs_lc.c delete mode 100644 src/fs/gnunet-service-fs_lc.h (limited to 'src') diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 1e699fea3..bde2843a6 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c @@ -307,7 +307,7 @@ expired_processor (void *cls, { struct GNUNET_TIME_Absolute now; - if (key == NULL) + if (NULL == key) { expired_kill_task = GNUNET_SCHEDULER_add_delayed_with_priority (MAX_EXPIRE_DELAY, 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, if (NULL != sr->download) { sr->download->search = NULL; - sr->download->top = - GNUNET_FS_make_top (sr->download->h, + sr->download->top + = GNUNET_FS_make_top (sr->download->h, &GNUNET_FS_download_signal_suspend_, sr->download); if (NULL != sr->download->serialization) @@ -1682,7 +1682,8 @@ search_result_stop (void *cls, sr->download->serialization = NULL; } pi.status = GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT; - GNUNET_FS_download_make_status_ (&pi, sr->download); + GNUNET_FS_download_make_status_ (&pi, + sr->download); GNUNET_FS_download_sync_ (sr->download); sr->download = NULL; } @@ -1748,25 +1749,28 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc) if (NULL != sc->top) GNUNET_FS_end_top (sc->h, sc->top); GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, - &search_result_stop, sc); + &search_result_stop, + sc); if (NULL != sc->psearch_result) sc->psearch_result->update_search = NULL; if (NULL != sc->serialization) { GNUNET_FS_remove_sync_file_ (sc->h, - (sc->psearch_result != - NULL) ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH : - GNUNET_FS_SYNC_PATH_MASTER_SEARCH, + (NULL != sc->psearch_result) + ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH + : GNUNET_FS_SYNC_PATH_MASTER_SEARCH, sc->serialization); GNUNET_FS_remove_sync_dir_ (sc->h, - (sc->psearch_result != - NULL) ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH : - GNUNET_FS_SYNC_PATH_MASTER_SEARCH, + (NULL != sc->psearch_result) + ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH + : GNUNET_FS_SYNC_PATH_MASTER_SEARCH, sc->serialization); GNUNET_free (sc->serialization); } pi.status = GNUNET_FS_STATUS_SEARCH_STOPPED; - sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc); + sc->client_info = GNUNET_FS_search_make_status_ (&pi, + sc->h, + sc); GNUNET_break (NULL == sc->client_info); if (NULL != sc->task) { 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 @@ #include "gnunet_util_lib.h" #include "gnunet-service-fs_cp.h" #include "gnunet-service-fs_indexing.h" -#include "gnunet-service-fs_lc.h" #include "gnunet-service-fs_pe.h" #include "gnunet-service-fs_pr.h" #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 @@ -/* - This file is part of GNUnet. - Copyright (C) 2011 GNUnet e.V. - - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -/** - * @file fs/gnunet-service-fs_lc.c - * @brief API to handle 'local clients' - * @author Christian Grothoff - */ -#include "platform.h" -#include "gnunet-service-fs.h" -#include "gnunet-service-fs_lc.h" -#include "gnunet-service-fs_cp.h" -#include "gnunet-service-fs_pr.h" - - - -/* 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 @@ -/* - This file is part of GNUnet. - Copyright (C) 2011 GNUnet e.V. - - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -/** - * @file fs/gnunet-service-fs_lc.h - * @brief API to handle 'local clients' - * @author Christian Grothoff - */ -#ifndef GNUNET_SERVICE_FS_LC_H -#define GNUNET_SERVICE_FS_LC_H - -#include "gnunet-service-fs.h" - - -#endif -/* end of gnunet-service-fs_lc.h */ -- cgit v1.2.3