projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use SSH more safely from configure
[oweals/gnunet.git]
/
src
/
util
/
common_endian.c
diff --git
a/src/util/common_endian.c
b/src/util/common_endian.c
index 247e9e876db8aa961463894d8fe52a5f5092ce26..45707f4ef70f14f8d4abb1df0fd6602b642438cf 100644
(file)
--- a/
src/util/common_endian.c
+++ b/
src/util/common_endian.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2006, 2012 Christian Grothoff (and other contributing authors)
+
Copyright
(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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,40
+14,43
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file util/common_endian.c
* @brief endian conversion helpers
* @author Christian Grothoff
*/
/**
* @file util/common_endian.c
* @brief endian conversion helpers
* @author Christian Grothoff
+ * @author Gabor X Toth
*/
#include "platform.h"
*/
#include "platform.h"
-#include "gnunet_
util
_lib.h"
+#include "gnunet_
crypto
_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
+
uint64_t
uint64_t
-GNUNET_
ntoh
ll (uint64_t n)
+GNUNET_
hton
ll (uint64_t n)
{
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
{
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
- return (((uint64_t)
ntohl (n)) << 32) + ntoh
l (n >> 32);
+ return (((uint64_t)
htonl (n)) << 32) + hton
l (n >> 32);
#else
#error byteorder undefined
#endif
}
#else
#error byteorder undefined
#endif
}
+
uint64_t
uint64_t
-GNUNET_
hton
ll (uint64_t n)
+GNUNET_
ntoh
ll (uint64_t n)
{
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
{
#if __BYTE_ORDER == __BIG_ENDIAN
return n;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
- return (((uint64_t)
htonl (n)) << 32) + hton
l (n >> 32);
+ return (((uint64_t)
ntohl (n)) << 32) + ntoh
l (n >> 32);
#else
#error byteorder undefined
#endif
#else
#error byteorder undefined
#endif
@@
-59,8
+62,8
@@
GNUNET_htonll (uint64_t n)
* @param d the value in network byte order
* @return the same value in host 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
+GNUNET_hton_double (double d)
{
double res;
uint64_t *in = (uint64_t *) &d;
{
double res;
uint64_t *in = (uint64_t *) &d;
@@
-77,18
+80,17
@@
GNUNET_hton_double (double d)
* @param d the value in network byte order
* @return the same value in 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
+GNUNET_ntoh_double (double d)
{
double res;
uint64_t *in = (uint64_t *) &d;
uint64_t *out = (uint64_t *) &res;
out[0] = GNUNET_ntohll(in[0]);
{
double res;
uint64_t *in = (uint64_t *) &d;
uint64_t *out = (uint64_t *) &res;
out[0] = GNUNET_ntohll(in[0]);
-
+
return res;
}
return res;
}
-
/* end of common_endian.c */
/* end of common_endian.c */