fixing warnings

5 files changed, 35 insertions, 30 deletions

diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 4390a8277..db94f05ab 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -412,11 +412,12 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle *sched,
  */
 GNUNET_SCHEDULER_TaskIdentifier
 GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle *sched,
-                           int run_on_shutdown,
-                           enum GNUNET_SCHEDULER_Priority prio,
-                           GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
-                           struct GNUNET_TIME_Relative delay,
-                           struct GNUNET_DISK_FileHandle *rfd, GNUNET_SCHEDULER_Task main, void *cls);
+                                int run_on_shutdown,
+                                enum GNUNET_SCHEDULER_Priority prio,
+                                GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+                                struct GNUNET_TIME_Relative delay,
+                                const struct GNUNET_DISK_FileHandle *rfd, 
+                                GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
@@ -445,11 +446,12 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle *sched,
  */
 GNUNET_SCHEDULER_TaskIdentifier
 GNUNET_SCHEDULER_add_write_file (struct GNUNET_SCHEDULER_Handle *sched,
-                            int run_on_shutdown,
-                            enum GNUNET_SCHEDULER_Priority prio,
-                            GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
-                            struct GNUNET_TIME_Relative delay,
-                            struct GNUNET_DISK_FileHandle *wfd, GNUNET_SCHEDULER_Task main, void *cls);
+                                 int run_on_shutdown,
+                                 enum GNUNET_SCHEDULER_Priority prio,
+                                 GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+                                 struct GNUNET_TIME_Relative delay,
+                                 const struct GNUNET_DISK_FileHandle *wfd,
+                                 GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
diff --git a/src/util/disk.c b/src/util/disk.c
index b8653ed1e..3f46923f7 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -877,10 +877,11 @@ int
 GNUNET_DISK_file_copy (const char *src, const char *dst)
 {
   char *buf;
-  unsigned long long pos;
-  unsigned long long size;
-  unsigned long long len;
-  struct GNUNET_DISK_FileHandle *in, *out;
+  uint64_t pos;
+  uint64_t size;
+  size_t len;
+  struct GNUNET_DISK_FileHandle *in;
+  struct GNUNET_DISK_FileHandle *out;
 
   if (GNUNET_OK != GNUNET_DISK_file_size (src, &size, GNUNET_YES))
     return GNUNET_SYSERR;
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 5643a25d0..d1d4e1970 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -896,11 +896,12 @@ GNUNET_SCHEDULER_add_select (struct GNUNET_SCHEDULER_Handle * sched,
  */
 GNUNET_SCHEDULER_TaskIdentifier
 GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle * sched,
-                           int run_on_shutdown,
-                           enum GNUNET_SCHEDULER_Priority prio,
-                           GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
-                           struct GNUNET_TIME_Relative delay,
-                           struct GNUNET_DISK_FileHandle *rfd, GNUNET_SCHEDULER_Task main, void *cls)
+                                int run_on_shutdown,
+                                enum GNUNET_SCHEDULER_Priority prio,
+                                GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+                                struct GNUNET_TIME_Relative delay,
+                                const struct GNUNET_DISK_FileHandle *rfd,
+                                GNUNET_SCHEDULER_Task main, void *cls)
 {
   struct GNUNET_NETWORK_FDSet *rs;
   GNUNET_SCHEDULER_TaskIdentifier ret;
@@ -942,11 +943,12 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle * sched,
  */
 GNUNET_SCHEDULER_TaskIdentifier
 GNUNET_SCHEDULER_add_write_file (struct GNUNET_SCHEDULER_Handle * sched,
-                            int run_on_shutdown,
-                            enum GNUNET_SCHEDULER_Priority prio,
-                            GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
-                            struct GNUNET_TIME_Relative delay,
-                            struct GNUNET_DISK_FileHandle *wfd, GNUNET_SCHEDULER_Task main, void *cls)
+                                 int run_on_shutdown,
+                                 enum GNUNET_SCHEDULER_Priority prio,
+                                 GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+                                 struct GNUNET_TIME_Relative delay,
+                                 const struct GNUNET_DISK_FileHandle *wfd,
+                                 GNUNET_SCHEDULER_Task main, void *cls)
 {
   struct GNUNET_NETWORK_FDSet *ws;
   GNUNET_SCHEDULER_TaskIdentifier ret;
diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index f978287ae..7925c80e4 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -86,7 +86,7 @@ static int
 testOpenClose ()
 {
   struct GNUNET_DISK_FileHandle *fh;
-  unsigned long long size;
+  uint64_t size;
   long avail;
 
   fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 6ae293058..0d5af1c0c 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -119,11 +119,11 @@ task5 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   fds[0] = GNUNET_DISK_pipe_handle (p, 0);
   fds[1] = GNUNET_DISK_pipe_handle (p, 1);
   GNUNET_SCHEDULER_add_read_file (tc->sched,
-                             GNUNET_NO,
-                             GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                             GNUNET_SCHEDULER_NO_TASK,
-                             GNUNET_TIME_UNIT_FOREVER_REL,
-                             fds[0], &taskRd, cls);
+                                  GNUNET_NO,
+                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+                                  GNUNET_SCHEDULER_NO_TASK,
+                                  GNUNET_TIME_UNIT_FOREVER_REL,
+                                  fds[0], &taskRd, cls);
   GNUNET_SCHEDULER_add_write_file (tc->sched,
                               GNUNET_NO,
                               GNUNET_SCHEDULER_PRIORITY_DEFAULT,