3 files changed, 20 insertions, 6 deletions

diff --git a/src/util/disk.c b/src/util/disk.c
index 46a71b48f..07b25674e 100644
--- 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 17ebe4a0a..96324e120 100644
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -30,15 +30,27 @@
 

 #include "gnunet_disk_lib.h"

 

+

+/**

+ * Handle used to access files (and pipes).  

+ */

 struct GNUNET_DISK_FileHandle

 {

 #ifdef MINGW

+  /**

+   * File handle under W32.

+   */

   HANDLE h;

 #else

+  /**

+   * File handle on other OSes.

+   */

   int fd;

 #endif

 };

 

+

+

 /**

  * Retrieve OS file handle

  *

@@ -48,7 +60,8 @@ struct GNUNET_DISK_FileHandle
  * @param dst_len length of dst

  * @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);

+int GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,

+                                      void *dst,

+                                      size_t dst_len);

 

 #endif /* GNUNET_DISK_H_ */

diff --git a/src/util/network.c b/src/util/network.c
index 2278ae34b..c10317258 100644
--- 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

   HANDLE hw;

 

-  GNUNET_internal_disk_file_handle (h, &hw, sizeof (HANDLE));

+  GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE));

   GNUNET_CONTAINER_slist_add (fds->handles, GNUNET_NO, &hw, sizeof (HANDLE));

 #else

   int fd;

 

-  GNUNET_internal_disk_file_handle (h, &fd, sizeof (int));

+  GNUNET_DISK_internal_file_handle_ (h, &fd, sizeof (int));

   FD_SET (fd, &fds->sds);

   if (fd + 1 > fds->nsds)

     fds->nsds = fd + 1;