aboutsummaryrefslogtreecommitdiff
path: root/src/util/scheduler.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-01-04 19:18:32 +0100
committerChristian Grothoff <christian@grothoff.org>2018-01-04 19:18:40 +0100
commit0baf3c103e55a8227de32a6d43afd749538bb1a5 (patch)
tree01492d52158eea25e42b505a08a124f633813d33 /src/util/scheduler.c
parente7e3572182bf2a0d51ae449abeee0fabbb18a0b4 (diff)
downloadgnunet-0baf3c103e55a8227de32a6d43afd749538bb1a5.tar.gz
gnunet-0baf3c103e55a8227de32a6d43afd749538bb1a5.zip
fix misc compiler warnings
Diffstat (limited to 'src/util/scheduler.c')
-rw-r--r--src/util/scheduler.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 992f8fdff..7bd19df7a 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -847,16 +847,19 @@ init_fd_info (struct GNUNET_SCHEDULER_Task *t,
847 * @param et the event type to be set in each FdInfo after calling 847 * @param et the event type to be set in each FdInfo after calling
848 * @a driver_func on it, or -1 if no updating not desired. 848 * @a driver_func on it, or -1 if no updating not desired.
849 */ 849 */
850void driver_add_multiple (struct GNUNET_SCHEDULER_Task *t, 850static void
851 enum GNUNET_SCHEDULER_EventType et) 851driver_add_multiple (struct GNUNET_SCHEDULER_Task *t,
852 enum GNUNET_SCHEDULER_EventType et)
852{ 853{
853 struct GNUNET_SCHEDULER_FdInfo *fdi; 854 struct GNUNET_SCHEDULER_FdInfo *fdi;
854 int success = GNUNET_YES; 855 int success = GNUNET_YES;
855 856
856 for (int i = 0; i != t->fds_len; ++i) 857 for (unsigned int i = 0; i != t->fds_len; ++i)
857 { 858 {
858 fdi = &t->fds[i]; 859 fdi = &t->fds[i];
859 success = scheduler_driver->add (scheduler_driver->cls, t, fdi) && success; 860 success = scheduler_driver->add (scheduler_driver->cls,
861 t,
862 fdi) && success;
860 if (et != -1) 863 if (et != -1)
861 { 864 {
862 fdi->et = et; 865 fdi->et = et;
@@ -870,12 +873,13 @@ void driver_add_multiple (struct GNUNET_SCHEDULER_Task *t,
870} 873}
871 874
872 875
873void 876static void
874shutdown_cb (void *cls) 877shutdown_cb (void *cls)
875{ 878{
876 char c; 879 char c;
877 const struct GNUNET_DISK_FileHandle *pr; 880 const struct GNUNET_DISK_FileHandle *pr;
878 881
882 (void) cls;
879 pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle, 883 pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle,
880 GNUNET_DISK_PIPE_END_READ); 884 GNUNET_DISK_PIPE_END_READ);
881 GNUNET_assert (! GNUNET_DISK_handle_invalid (pr)); 885 GNUNET_assert (! GNUNET_DISK_handle_invalid (pr));
@@ -975,6 +979,8 @@ init_backtrace (struct GNUNET_SCHEDULER_Task *t)
975 backtrace_symbols (backtrace_array, 979 backtrace_symbols (backtrace_array,
976 t->num_backtrace_strings); 980 t->num_backtrace_strings);
977 dump_backtrace (t); 981 dump_backtrace (t);
982#else
983 (void) t;
978#endif 984#endif
979} 985}
980 986
@@ -1664,14 +1670,15 @@ extract_handles (struct GNUNET_SCHEDULER_Task *t,
1664 // in fdset must be handled separately 1670 // in fdset must be handled separately
1665 const struct GNUNET_NETWORK_Handle **nhandles; 1671 const struct GNUNET_NETWORK_Handle **nhandles;
1666 const struct GNUNET_DISK_FileHandle **fhandles; 1672 const struct GNUNET_DISK_FileHandle **fhandles;
1667 unsigned int nhandles_len, fhandles_len; 1673 unsigned int nhandles_len;
1668 int sock; 1674 unsigned int fhandles_len;
1669 1675
1676 (void) t;
1670 nhandles = NULL; 1677 nhandles = NULL;
1671 fhandles = NULL; 1678 fhandles = NULL;
1672 nhandles_len = 0; 1679 nhandles_len = 0;
1673 fhandles_len = 0; 1680 fhandles_len = 0;
1674 for (sock = 0; sock != fdset->nsds; ++sock) 1681 for (int sock = 0; sock != fdset->nsds; ++sock)
1675 { 1682 {
1676 if (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (fdset, sock)) 1683 if (GNUNET_YES == GNUNET_NETWORK_fdset_test_native (fdset, sock))
1677 { 1684 {
@@ -1969,7 +1976,7 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh)
1969 // FIXME: do we have to remove FdInfos from fds if they are not ready? 1976 // FIXME: do we have to remove FdInfos from fds if they are not ready?
1970 tc.fds_len = pos->fds_len; 1977 tc.fds_len = pos->fds_len;
1971 tc.fds = pos->fds; 1978 tc.fds = pos->fds;
1972 for (int i = 0; i != pos->fds_len; ++i) 1979 for (unsigned int i = 0; i != pos->fds_len; ++i)
1973 { 1980 {
1974 struct GNUNET_SCHEDULER_FdInfo *fdi = &pos->fds[i]; 1981 struct GNUNET_SCHEDULER_FdInfo *fdi = &pos->fds[i];
1975 if (0 != (GNUNET_SCHEDULER_ET_IN & fdi->et)) 1982 if (0 != (GNUNET_SCHEDULER_ET_IN & fdi->et))