[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 34/45: cleanup
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 34/45: cleanup |
Date: |
Sun, 31 Dec 2017 00:37:21 +0100 |
This is an automated email from the git hooks/post-receive script.
lurchi pushed a commit to branch master
in repository gnunet.
commit 9bb58990f8935958d1ae963305eb69cd55dcea6d
Author: lurchi <address@hidden>
AuthorDate: Wed Aug 23 15:57:58 2017 +0200
cleanup
---
src/util/scheduler.c | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index b59919818..5e8d0844c 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -1621,7 +1621,7 @@ GNUNET_SCHEDULER_add_file_with_priority (struct
GNUNET_TIME_Relative delay,
}
-int
+void
extract_handles (struct GNUNET_SCHEDULER_Task *t,
const struct GNUNET_NETWORK_FDSet *fdset,
const struct GNUNET_NETWORK_Handle ***ntarget,
@@ -1635,13 +1635,11 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t,
const struct GNUNET_DISK_FileHandle **fhandles;
unsigned int nhandles_len, fhandles_len;
int sock;
- int ret;
nhandles = NULL;
fhandles = NULL;
nhandles_len = 0;
fhandles_len = 0;
- ret = GNUNET_OK;
for (sock = 0; sock != fdset->nsds; ++sock)
{
if (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (fdset, sock))
@@ -1663,8 +1661,6 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t,
}
else
{
- ret = GNUNET_SYSERR;
- // DEBUG
GNUNET_assert (0);
}
}
@@ -1674,7 +1670,6 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t,
*ftarget = fhandles_len > 0 ? fhandles : NULL;
*extracted_nhandles = nhandles_len;
*extracted_fhandles = fhandles_len;
- return ret;
}
@@ -2120,26 +2115,6 @@ select_add (void *cls,
GNUNET_CONTAINER_DLL_insert (context->scheduled_head,
context->scheduled_tail,
scheduled);
- //if (0 != (GNUNET_SCHEDULER_ET_IN & scheduled->et))
- //{
- // GNUNET_CONTAINER_DLL_insert (context->scheduled_in_head,
- // context->scheduled_in_tail,
- // scheduled);
- //}
- //if (0 != (GNUNET_SCHEDULER_ET_OUT & scheduled->et))
- //{
- // GNUNET_CONTAINER_DLL_insert (context->scheduled_out_head,
- // context->scheduled_out_tail,
- // scheduled);
- //}
- //if (0 != (GNUNET_SCHEDULER_ET_HUP & scheduled->et) ||
- // 0 != (GNUNET_SCHEDULER_ET_ERR & scheduled->et) ||
- // 0 != (GNUNET_SCHEDULER_ET_PRI & scheduled->et) ||
- // 0 != (GNUNET_SCHEDULER_ET_NVAL & scheduled->et))
- //{
- // // FIXME: other event types not implemented yet
- // GNUNET_assert (0);
- //}
return GNUNET_OK;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 15/45: fix initFdInfo; rename to init_fd_info, (continued)
- [GNUnet-SVN] [gnunet] 15/45: fix initFdInfo; rename to init_fd_info, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 10/45: fix segfault and pending_timeout logic, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 11/45: Smaller changes. Changed order when set_wakeup is called after some task is removed from pending_timeout, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 20/45: remove unnecessary set_wakup call, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 14/45: fix indentation; remove unneeded set_wakeup call, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 19/45: fix compilation of debug code enabled by DEBUG_FDS; fix indentation, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 25/45: fix off-by-one error that prevented reading from stdin, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 36/45: fix behaviour of GNUNET_SCHEDULER_add_select on empty fdsets, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 39/45: Don't consider restart when the test action already finished, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 35/45: NULL-initialize array pointers, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 34/45: cleanup,
gnunet <=
- [GNUnet-SVN] [gnunet] 28/45: increasing length variable is already done by GNUNET_xgrow_ (called by the GNUNET_array_append macro), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 31/45: improve documentation about the GNUNET_array_append and GNUNET_array_grow macros, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 22/45: Revert "set fds_len in all cases; call set_wakeup only in two places", gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 33/45: GNUNET_SCHEDULER_check_lifeness not needed anymore, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 23/45: set fds_len in all cases; call set_wakeup only in two places, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 21/45: set fds_len in all cases; call set_wakeup only in two places, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 38/45: clarify documentation about adding / deleting tasks, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 12/45: separate the select driver's fd sets from the driver-internal fdsets, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 40/45: Remove busy waiting checks, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 29/45: implement bookkeeping about which FDs related to a tasks have been marked ready (required API change in GNUNET_SCHEDULER_task_ready), gnunet, 2017/12/30