-fix the fix

[oweals/gnunet.git] / src / util / disk.h

diff --git a/src/util/disk.h b/src/util/disk.h
index f287834b809137cdf64fc3ddd86d621cc09f3dd5..149890390db314db050a77c2db4b44fe41a7ac98 100644 (file)
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 GNUnet e.V.
 
      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
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -14,67 +14,32 @@
 
      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.
-*/  
-  
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
+*/
+
 /**
  * @file util/disk.h
  * @brief Internal DISK related helper functions
  * @author Nils Durner
- */ 
-  \r
+ */
 #ifndef GNUNET_DISK_H_
 #define GNUNET_DISK_H_
-  
-#include "gnunet_disk_lib.h"
-  \r
-/**
- * Handle used to access files (and pipes).  
- */ 
-struct GNUNET_DISK_FileHandle 
-{
-  
-#ifdef MINGW
-  /**
-   * File handle under W32.
-   */ 
-  HANDLE h;
-
-  /**
-   * Type
-   */
-  enum {GNUNET_DISK_FILE, GNUNET_PIPE} type;
 
-  /**
-   * Structure for overlapped reading (for pipes)
-   */
-  OVERLAPPED *oOverlapRead;
-
-  /**
-   * Structure for overlapped writing (for pipes)
-   */
-  OVERLAPPED *oOverlapWrite;
-#else
+#include "gnunet_crypto_lib.h"
+#include "gnunet_disk_lib.h"
 
-  /**
-   * File handle on other OSes.
-   */ 
-  int fd;
-   
-#endif                          /* \r */
-};
-\r\r\r
 /**
  * Retrieve OS file handle
  *
  * @internal
  * @param fh GNUnet file descriptor
  * @param dst destination buffer
- * @param dst_len length of dst
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
- */ 
-int GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle
-                                       *fh, \rvoid *dst, \rsize_t dst_len);
-\r
-#endif  /* GNUNET_DISK_H_ */
+ * @param dst_len length of @a dst
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
+ */
+int
+GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,
+                                   void *dst, size_t dst_len);
+
+#endif /* GNUNET_DISK_H_ */