GNUNET_IO_handle => GNUNET_DISK_handle

12 files changed, 60 insertions, 162 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 0fb7aa0fd..bc832c444 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -24,7 +24,6 @@ gnunetinclude_HEADERS = \
   gnunet_fragmentation_lib.h \
   gnunet_getopt_lib.h \
   gnunet_hello_lib.h \
-  gnunet_io_lib.h \
   gnunet_network_lib.h \
   gnunet_peerinfo_service.h \
   gnunet_program_lib.h \
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 080d8c09b..2c7488cc4 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -28,7 +28,6 @@
 
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
-#include "gnunet_io_lib.h"
 
 /* we need size_t, and since it can be both unsigned int
    or unsigned long long, this IS platform dependent;
@@ -75,6 +74,8 @@ extern "C"
 
 enum GNUNET_DISK_Seek {GNUNET_SEEK_SET, GNUNET_SEEK_CUR, GNUNET_SEEK_END};
 
+struct GNUNET_IO_Handle;
+
 /**
  * Get the number of blocks that are left on the partition that
  * contains the given file (for normal users).
@@ -86,6 +87,14 @@ long GNUNET_DISK_get_blocks_available (const char *part);
 
 
 /**
+ * Checks whether a handle is invalid
+ * @param h handle to check
+ * @return GNUNET_YES if invalid, GNUNET_NO if valid
+ */
+int GNUNET_DISK_handle_invalid (const struct GNUNET_IO_Handle *h);
+
+
+/**
  * Check that fil corresponds to a filename
  * (of a file that exists and that is not a directory).
  *
@@ -153,7 +162,7 @@ int GNUNET_DISK_file_read (const struct GNUNET_IO_Handle *h, void *result, int l
  * @param fn file name
  * @param result the buffer to write the result to
  * @param len the maximum number of bytes to read
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return number of bytes read, GNUNET_SYSERR on failure
  */
 int GNUNET_DISK_fn_read (const char * const fn, void *result, int len);
 
diff --git a/src/include/gnunet_io_lib.h b/src/include/gnunet_io_lib.h
deleted file mode 100644
index 3d04a2317..000000000
--- a/src/include/gnunet_io_lib.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file include/gnunet_io_lib.h
- * @brief Helper functions for abstract IO handles
- * @author Nils Durner
- */
-
-#ifndef IO_HANDLE_H_
-#define IO_HANDLE_H_
-
-struct GNUNET_IO_Handle;
-
-/**
- * Checks whether a handle is invalid
- * @param h handle to check
- * @return GNUNET_YES if invalid, GNUNET_NO if valid
- */
-int GNUNET_IO_handle_invalid (const struct GNUNET_IO_Handle *h);
-
-/**
- * Mark a handle as invalid
- * @param h file handle
- */
-void GNUNET_IO_handle_invalidate (struct GNUNET_IO_Handle *h);
-
-
-#endif /* IO_HANDLE_H_ */
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 58621caf5..6354e28fa 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -43,7 +43,6 @@ extern "C"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_getopt_lib.h"
-#include "gnunet_io_lib.h"
 #include "gnunet_network_lib.h"
 #include "gnunet_plugin_lib.h"
 #include "gnunet_program_lib.h"
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 014521f90..64178e538 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -33,8 +33,6 @@ libgnunetutil_la_SOURCES = \
   disk.c \
   getopt.c \
   getopt_helpers.c \
-  io_handle.c \
-  io_handle.h \
   network.c \
   os_installation.c \
   os_load.c \
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 37780cb2a..e5a0955c4 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -151,7 +151,7 @@ incrementBit (char *bitArray, unsigned int bitIdx, const struct GNUNET_IO_Handle
   unsigned int targetLoc;
 
   setBit (bitArray, bitIdx);
-  if (GNUNET_IO_handle_invalid (fh))
+  if (GNUNET_DISK_handle_invalid (fh))
     return;
   /* Update the counter file on disk */
   fileSlot = bitIdx / 2;
@@ -195,7 +195,7 @@ decrementBit (char *bitArray, unsigned int bitIdx, const struct GNUNET_IO_Handle
   unsigned int low;
   unsigned int targetLoc;
 
-  if (GNUNET_IO_handle_invalid (fh))
+  if (GNUNET_DISK_handle_invalid (fh))
     return;                     /* cannot decrement! */
   /* Each char slot in the counter file holds two 4 bit counters */
   fileSlot = bitIdx / 2;
@@ -246,7 +246,7 @@ makeEmptyFile (const struct GNUNET_IO_Handle *fh, unsigned int size)
   unsigned int bytesleft = size;
   int res = 0;
 
-  if (GNUNET_IO_handle_invalid (fh))
+  if (GNUNET_DISK_handle_invalid (fh))
     return GNUNET_SYSERR;
   buffer = GNUNET_malloc (BUFFSIZE);
   memset (buffer, 0, BUFFSIZE);
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 5a7cb33d7..dbb112666 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -443,7 +443,7 @@ file_hash_finish (struct FileHashContext *fhc, const GNUNET_HashCode * res)
 {
   fhc->callback (fhc->callback_cls, res);
   GNUNET_free (fhc->filename);
-  if (!GNUNET_IO_handle_invalid (fhc->fh))
+  if (!GNUNET_DISK_handle_invalid (fhc->fh))
     GNUNET_break (0 == GNUNET_DISK_file_close (&fhc->fh));
   GNUNET_free (fhc);            /* also frees fhc->buffer */
 }
diff --git a/src/util/disk.c b/src/util/disk.c
index 2c592dcfa..2722dda71 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -26,10 +26,8 @@
  */
 
 #include "platform.h"
-#include "io_handle.h"
 #include "gnunet_common.h"
 #include "gnunet_directories.h"
-#include "gnunet_io_lib.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_strings_lib.h"
@@ -76,6 +74,15 @@ typedef struct
   int include_sym_links;
 } GetFileSizeData;
 
+struct GNUNET_IO_Handle
+{
+#if MINGW
+  HANDLE h;
+#else
+  int fd;
+#endif
+};
+
 static int
 getSizeRec (void *ptr, const char *fn)
 {
@@ -111,6 +118,34 @@ getSizeRec (void *ptr, const char *fn)
   return GNUNET_OK;
 }
 
+/**
+ * Checks whether a handle is invalid
+ * @param h handle to check
+ * @return GNUNET_YES if invalid, GNUNET_NO if valid
+ */
+int
+GNUNET_DISK_handle_invalid (const struct GNUNET_IO_Handle *h)
+{
+#ifdef MINGW
+  return !h || h->h == INVALID_HANDLE_VALUE ? GNUNET_YES : GNUNET_NO;
+#else
+  return !h || h->fd == -1 ? GNUNET_YES : GNUNET_NO;
+#endif
+}
+
+/**
+ * Mark a handle as invalid
+ * @param h file handle
+ */
+static void
+GNUNET_DISK_handle_invalidate (struct GNUNET_IO_Handle *h)
+{
+#ifdef MINGW
+  h->h = INVALID_HANDLE_VALUE;
+#else
+  h->fd = -1;
+#endif
+}
 
 /**
  * Move the read/write pointer in a file
@@ -435,7 +470,7 @@ GNUNET_DISK_file_read (const struct GNUNET_IO_Handle *h, void *result, int len)
  * @param fn file name
  * @param result the buffer to write the result to
  * @param len the maximum number of bytes to read
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ * @return number of bytes read, GNUNET_SYSERR on failure
  */
 int
 GNUNET_DISK_fn_read (const char * const fn, void *result, int len)
@@ -446,7 +481,7 @@ GNUNET_DISK_fn_read (const char * const fn, void *result, int len)
   fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_READ);
   if (!fh)
     return GNUNET_SYSERR;
-  ret = (len == GNUNET_DISK_file_read (fh, result, len)) ? GNUNET_OK : GNUNET_SYSERR;
+  ret = GNUNET_DISK_file_read (fh, result, len);
   GNUNET_assert(GNUNET_OK == GNUNET_DISK_file_close(&fh));
 
   return ret;
@@ -1094,7 +1129,7 @@ GNUNET_DISK_file_close (struct GNUNET_IO_Handle **h)
   }
 #endif
 
-  GNUNET_IO_handle_invalidate (*h);
+  GNUNET_DISK_handle_invalidate (*h);
   free(*h);
   *h = NULL;
 
@@ -1272,7 +1307,7 @@ GNUNET_DISK_file_unmap (struct GNUNET_IO_Handle **h, void *addr, size_t len)
       SetErrnoFromWinError (GetLastError ());
     }
 
-  GNUNET_IO_handle_invalidate (*h);
+  GNUNET_DISK_handle_invalidate (*h);
   GNUNET_free (*h);
   h = NULL;
 
@@ -1280,7 +1315,7 @@ GNUNET_DISK_file_unmap (struct GNUNET_IO_Handle **h, void *addr, size_t len)
 #else
   int ret;
   ret = munmap (addr, len) != -1 ? GNUNET_OK : GNUNET_SYSERR;
-  GNUNET_IO_handle_invalidate (h);
+  GNUNET_DISK_handle_invalidate (*h);
   return ret;
 #endif
 }
diff --git a/src/util/io_handle.c b/src/util/io_handle.c
deleted file mode 100644
index 438974797..000000000
--- a/src/util/io_handle.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file util/io_handle.c
- * @brief common functions for IO handles
- * @author Nils Durner
- */
-#include "platform.h"
-#include "io_handle.h"
-#include "gnunet_common.h"
-
-/**
- * Checks whether a handle is invalid
- * @param h handle to check
- * @return GNUNET_YES if invalid, GNUNET_NO if valid
- */
-int
-GNUNET_IO_handle_invalid (const struct GNUNET_IO_Handle *h)
-{
-#ifdef MINGW
-  return !h || h->h == INVALID_HANDLE_VALUE ? GNUNET_YES : GNUNET_NO;
-#else
-  return !h || h->fd == -1 ? GNUNET_YES : GNUNET_NO;
-#endif
-}
-
-/**
- * Mark a handle as invalid
- * @param h file handle
- */
-void
-GNUNET_IO_handle_invalidate (struct GNUNET_IO_Handle *h)
-{
-#ifdef MINGW
-  h->h = INVALID_HANDLE_VALUE;
-#else
-  h->fd = -1;
-#endif
-}
-
-/* end of io_handle.c */
diff --git a/src/util/io_handle.h b/src/util/io_handle.h
deleted file mode 100644
index 04e735748..000000000
--- a/src/util/io_handle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file util/io_handle.h
- * @brief wrapper structure for file handles, sockets, ...
- */
-
-#ifndef IO_HANDLE_H_
-#define IO_HANDLE_H_
-
-struct GNUNET_IO_Handle
-{
-#if MINGW
-  HANDLE h;
-#else
-  int fd;
-#endif
-};
-
-#endif /* IO_HANDLE_H_ */
diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index e305889d8..f89b1de25 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -92,7 +92,7 @@ testOpenClose ()
   fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE
       | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_READ
       | GNUNET_DISK_PERM_USER_WRITE);
-  GNUNET_assert (GNUNET_NO == GNUNET_IO_handle_invalid (fh));
+  GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh));
   GNUNET_break (5 == GNUNET_DISK_file_write (fh, "Hello", 5));
   GNUNET_DISK_file_close (&fh);
   GNUNET_break (GNUNET_OK ==
@@ -108,7 +108,7 @@ testOpenClose ()
   fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE
       | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_WRITE
       | GNUNET_DISK_PERM_USER_READ);
-  GNUNET_assert (GNUNET_NO == GNUNET_IO_handle_invalid (fh));
+  GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh));
   while ((avail == GNUNET_DISK_get_blocks_available (".testfile")) &&
          (avail != -1))
     if (16 != GNUNET_DISK_file_write (fh, "HelloWorld123456", 16))
diff --git a/src/util/test_os_load.c b/src/util/test_os_load.c
index 8e9776883..4885ed3bb 100644
--- a/src/util/test_os_load.c
+++ b/src/util/test_os_load.c
@@ -135,7 +135,7 @@ testdisk ()
   fh = GNUNET_DISK_file_open (".loadfile", GNUNET_DISK_OPEN_WRITE
       | GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_READ
       | GNUNET_DISK_PERM_USER_WRITE);
-  GNUNET_assert (GNUNET_NO == GNUNET_IO_handle_invalid(fh));
+  GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid(fh));
   while (GNUNET_TIME_absolute_get_duration (start).value < 60 * 1000)
     {
       GNUNET_DISK_file_seek (fh, GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,