diff options
author | lurchi <lurchi@strangeplace.net> | 2017-08-23 15:57:58 +0200 |
---|---|---|
committer | lurchi <lurchi@strangeplace.net> | 2017-08-23 15:57:58 +0200 |
commit | 9bb58990f8935958d1ae963305eb69cd55dcea6d (patch) | |
tree | cf59c0773155ca06276a7220c30822e2d5e383a1 /src | |
parent | b5080c190338cc9031a9d81916828b0ddd855eb3 (diff) | |
download | gnunet-9bb58990f8935958d1ae963305eb69cd55dcea6d.tar.gz gnunet-9bb58990f8935958d1ae963305eb69cd55dcea6d.zip |
cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/util/scheduler.c | 27 |
1 files changed, 1 insertions, 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, | |||
1621 | } | 1621 | } |
1622 | 1622 | ||
1623 | 1623 | ||
1624 | int | 1624 | void |
1625 | extract_handles (struct GNUNET_SCHEDULER_Task *t, | 1625 | extract_handles (struct GNUNET_SCHEDULER_Task *t, |
1626 | const struct GNUNET_NETWORK_FDSet *fdset, | 1626 | const struct GNUNET_NETWORK_FDSet *fdset, |
1627 | const struct GNUNET_NETWORK_Handle ***ntarget, | 1627 | const struct GNUNET_NETWORK_Handle ***ntarget, |
@@ -1635,13 +1635,11 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t, | |||
1635 | const struct GNUNET_DISK_FileHandle **fhandles; | 1635 | const struct GNUNET_DISK_FileHandle **fhandles; |
1636 | unsigned int nhandles_len, fhandles_len; | 1636 | unsigned int nhandles_len, fhandles_len; |
1637 | int sock; | 1637 | int sock; |
1638 | int ret; | ||
1639 | 1638 | ||
1640 | nhandles = NULL; | 1639 | nhandles = NULL; |
1641 | fhandles = NULL; | 1640 | fhandles = NULL; |
1642 | nhandles_len = 0; | 1641 | nhandles_len = 0; |
1643 | fhandles_len = 0; | 1642 | fhandles_len = 0; |
1644 | ret = GNUNET_OK; | ||
1645 | for (sock = 0; sock != fdset->nsds; ++sock) | 1643 | for (sock = 0; sock != fdset->nsds; ++sock) |
1646 | { | 1644 | { |
1647 | if (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (fdset, sock)) | 1645 | if (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (fdset, sock)) |
@@ -1663,8 +1661,6 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t, | |||
1663 | } | 1661 | } |
1664 | else | 1662 | else |
1665 | { | 1663 | { |
1666 | ret = GNUNET_SYSERR; | ||
1667 | // DEBUG | ||
1668 | GNUNET_assert (0); | 1664 | GNUNET_assert (0); |
1669 | } | 1665 | } |
1670 | } | 1666 | } |
@@ -1674,7 +1670,6 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t, | |||
1674 | *ftarget = fhandles_len > 0 ? fhandles : NULL; | 1670 | *ftarget = fhandles_len > 0 ? fhandles : NULL; |
1675 | *extracted_nhandles = nhandles_len; | 1671 | *extracted_nhandles = nhandles_len; |
1676 | *extracted_fhandles = fhandles_len; | 1672 | *extracted_fhandles = fhandles_len; |
1677 | return ret; | ||
1678 | } | 1673 | } |
1679 | 1674 | ||
1680 | 1675 | ||
@@ -2120,26 +2115,6 @@ select_add (void *cls, | |||
2120 | GNUNET_CONTAINER_DLL_insert (context->scheduled_head, | 2115 | GNUNET_CONTAINER_DLL_insert (context->scheduled_head, |
2121 | context->scheduled_tail, | 2116 | context->scheduled_tail, |
2122 | scheduled); | 2117 | scheduled); |
2123 | //if (0 != (GNUNET_SCHEDULER_ET_IN & scheduled->et)) | ||
2124 | //{ | ||
2125 | // GNUNET_CONTAINER_DLL_insert (context->scheduled_in_head, | ||
2126 | // context->scheduled_in_tail, | ||
2127 | // scheduled); | ||
2128 | //} | ||
2129 | //if (0 != (GNUNET_SCHEDULER_ET_OUT & scheduled->et)) | ||
2130 | //{ | ||
2131 | // GNUNET_CONTAINER_DLL_insert (context->scheduled_out_head, | ||
2132 | // context->scheduled_out_tail, | ||
2133 | // scheduled); | ||
2134 | //} | ||
2135 | //if (0 != (GNUNET_SCHEDULER_ET_HUP & scheduled->et) || | ||
2136 | // 0 != (GNUNET_SCHEDULER_ET_ERR & scheduled->et) || | ||
2137 | // 0 != (GNUNET_SCHEDULER_ET_PRI & scheduled->et) || | ||
2138 | // 0 != (GNUNET_SCHEDULER_ET_NVAL & scheduled->et)) | ||
2139 | //{ | ||
2140 | // // FIXME: other event types not implemented yet | ||
2141 | // GNUNET_assert (0); | ||
2142 | //} | ||
2143 | return GNUNET_OK; | 2118 | return GNUNET_OK; |
2144 | } | 2119 | } |
2145 | 2120 | ||