[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8937 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8937 - in gnunet/src: include util |
Date: |
Fri, 4 Sep 2009 06:04:32 -0600 |
Author: grothoff
Date: 2009-09-04 06:04:31 -0600 (Fri, 04 Sep 2009)
New Revision: 8937
Modified:
gnunet/src/include/gnunet_scheduler_lib.h
gnunet/src/util/disk.c
gnunet/src/util/scheduler.c
gnunet/src/util/test_disk.c
gnunet/src/util/test_scheduler.c
Log:
fixing warnings
Modified: gnunet/src/include/gnunet_scheduler_lib.h
===================================================================
--- gnunet/src/include/gnunet_scheduler_lib.h 2009-09-04 10:45:43 UTC (rev
8936)
+++ gnunet/src/include/gnunet_scheduler_lib.h 2009-09-04 12:04:31 UTC (rev
8937)
@@ -412,11 +412,12 @@
*/
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_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);
/**
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-09-04 10:45:43 UTC (rev 8936)
+++ gnunet/src/util/disk.c 2009-09-04 12:04:31 UTC (rev 8937)
@@ -877,10 +877,11 @@
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;
Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2009-09-04 10:45:43 UTC (rev 8936)
+++ gnunet/src/util/scheduler.c 2009-09-04 12:04:31 UTC (rev 8937)
@@ -896,11 +896,12 @@
*/
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_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;
Modified: gnunet/src/util/test_disk.c
===================================================================
--- gnunet/src/util/test_disk.c 2009-09-04 10:45:43 UTC (rev 8936)
+++ gnunet/src/util/test_disk.c 2009-09-04 12:04:31 UTC (rev 8937)
@@ -86,7 +86,7 @@
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
Modified: gnunet/src/util/test_scheduler.c
===================================================================
--- gnunet/src/util/test_scheduler.c 2009-09-04 10:45:43 UTC (rev 8936)
+++ gnunet/src/util/test_scheduler.c 2009-09-04 12:04:31 UTC (rev 8937)
@@ -119,11 +119,11 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8937 - in gnunet/src: include util,
gnunet <=