X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fcommon_endian.c;h=117e575e4b228ec3341331a46800f516b0566469;hb=72c8645af31896829b674b575c5375706f362a30;hp=3a13214636433aad83b7b315b8ae2b3fa17e0b2f;hpb=aa79ba473f5351a046f870601524ba628aaa11b5;p=oweals%2Fgnunet.git

diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index 3a1321463..117e575e4 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2006, 2012 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
@@ -34,8 +34,10 @@ GNUNET_ntohll (uint64_t n)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
   return n;
-#else
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
   return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
+#else
+  #error byteorder undefined
 #endif
 }
 
@@ -44,35 +46,45 @@ GNUNET_htonll (uint64_t n)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
   return n;
-#else
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
   return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
+#else
+  #error byteorder undefined
 #endif
 }
 
 
+/**
+ * Convert double to network-byte-order.
+ * @param d the value in network byte order
+ * @return the same value in host byte order
+ */
 double 
 GNUNET_hton_double (double d) 
 {
   double res;
-  unsigned int *in = (unsigned int *) &d;
-  unsigned int *out = (unsigned int *) &res;
+  uint64_t *in = (uint64_t *) &d;
+  uint64_t *out = (uint64_t *) &res;
+
+  out[0] = GNUNET_htonll(in[0]);
 
-  out[0] = htonl(in[0]);
-  out[1] = htonl(in[1]);
- 
   return res;
 }
 
 
+/**
+ * Convert double to host-byte-order
+ * @param d the value in network byte order
+ * @return the same value in host byte order
+ */
 double 
 GNUNET_ntoh_double (double d) 
 {
   double res;
-  unsigned int *in = (unsigned int *) &d;
-  unsigned int *out = (unsigned int *) &res;
+  uint64_t *in = (uint64_t *) &d;
+  uint64_t *out = (uint64_t *) &res;
 
-  out[0] = ntohl(in[0]);
-  out[1] = ntohl(in[1]);
+  out[0] = GNUNET_ntohll(in[0]);
  
   return res;
 }