Merge branch 'master' of ssh://gnunet.org/gnunet

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

diff --git a/src/util/disk.h b/src/util/disk.h
index 21c1ab9a1c59824e10150e0852e8706f66ac54f0..149890390db314db050a77c2db4b44fe41a7ac98 100644 (file)
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -1,65 +1,45 @@
-/*\r
-     This file is part of GNUnet.\r
-     (C) 2009 Christian Grothoff (and other contributing authors)\r
-\r
-     GNUnet is free software; you can redistribute it and/or modify\r
-     it under the terms of the GNU General Public License as published\r
-     by the Free Software Foundation; either version 2, or (at your\r
-     option) any later version.\r
-\r
-     GNUnet is distributed in the hope that it will be useful, but\r
-     WITHOUT ANY WARRANTY; without even the implied warranty of\r
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-     General Public License for more details.\r
-\r
-     You should have received a copy of the GNU General Public License\r
-     along with GNUnet; see the file COPYING.  If not, write to the\r
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
-     Boston, MA 02111-1307, USA.\r
-*/  \r
-  \r
-/**\r
- * @file util/disk.h\r
- * @brief Internal DISK related helper functions\r
- * @author Nils Durner\r
- */ \r
-  \r\r
-#ifndef GNUNET_DISK_H_\r
-#define GNUNET_DISK_H_\r
-  \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
- * @internal\r
- * @param fh GNUnet file descriptor\r
- * @param dst destination buffer\r
- * @param dst_len length of dst\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle
-                                       *fh, \rvoid *dst, \rsize_t dst_len);
-\r\r
-#endif  /* GNUNET_DISK_H_ */\r
+/*
+     This file is part of GNUnet.
+     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 3, 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., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
+*/
+
+/**
+ * @file util/disk.h
+ * @brief Internal DISK related helper functions
+ * @author Nils Durner
+ */
+#ifndef GNUNET_DISK_H_
+#define GNUNET_DISK_H_
+
+#include "gnunet_crypto_lib.h"
+#include "gnunet_disk_lib.h"
+
+/**
+ * Retrieve OS file handle
+ *
+ * @internal
+ * @param fh GNUnet file descriptor
+ * @param dst destination buffer
+ * @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_ */