fix

diff --git a/src/util/disk.c b/src/util/disk.c
index 46a71b48f323e68eb491271a9840d31901a9c90b..07b25674e4dd5843d964dee36e3629a98792e04c 100644 (file)
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1747,8 +1747,9 @@ GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p,
  * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
  */
 int
-GNUNET_internal_disk_file_handle (const struct GNUNET_DISK_FileHandle *fh,
-    void *dst, unsigned int dst_len)
+GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,
+                                  void *dst, 
+                                  size_t dst_len)
 {
 #ifdef MINGW
   if (dst_len < sizeof (HANDLE))

diff --git a/src/util/disk.h b/src/util/disk.h
index 17ebe4a0a7e6918babf2b7fb7e8e1ddcb62cbe1c..96324e120a3f56b5df0d29faa0e264faddcfa5f0 100644 (file)
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -30,15 +30,27 @@
 \r
 #include "gnunet_disk_lib.h"\r
 \r
+\r
+/**\r
+ * Handle used to access files (and pipes).  \r
+ */\r
 struct GNUNET_DISK_FileHandle\r
 {\r
 #ifdef MINGW\r
+  /**\r
+   * File handle under W32.\r
+   */\r
   HANDLE h;\r
 #else\r
+  /**\r
+   * File handle on other OSes.\r
+   */\r
   int fd;\r
 #endif\r
 };\r
 \r
+\r
+\r
 /**\r
  * Retrieve OS file handle\r
  *\r
@@ -48,7 +60,8 @@ struct GNUNET_DISK_FileHandle
  * @param dst_len length of dst\r
  * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
  */\r
-int GNUNET_internal_disk_file_handle (const struct GNUNET_DISK_FileHandle *fh,\r
-                                      void *dst, unsigned int dst_len);\r
+int GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,\r
+                                      void *dst,\r
+                                     size_t dst_len);\r
 \r
 #endif /* GNUNET_DISK_H_ */\r

diff --git a/src/util/network.c b/src/util/network.c
index 2278ae34ba44cb504cf4e4840d2bb656cbc613e6..c10317258e081854e83c47853ed4394d69408dee 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -527,12 +527,12 @@ GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds,
 #ifdef MINGW\r
   HANDLE hw;\r
 \r
-  GNUNET_internal_disk_file_handle (h, &hw, sizeof (HANDLE));\r
+  GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE));\r
   GNUNET_CONTAINER_slist_add (fds->handles, GNUNET_NO, &hw, sizeof (HANDLE));\r
 #else\r
   int fd;\r
 \r
-  GNUNET_internal_disk_file_handle (h, &fd, sizeof (int));\r
+  GNUNET_DISK_internal_file_handle_ (h, &fd, sizeof (int));\r
   FD_SET (fd, &fds->sds);\r
   if (fd + 1 > fds->nsds)\r
     fds->nsds = fd + 1;\r