projects
/
darkstat-debian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull in darkstat-3.0.718
[darkstat-debian]
/
db.c
diff --git
a/db.c
b/db.c
index
5a82d90
..
cadd26e
100644
(file)
--- a/
db.c
+++ b/
db.c
@@
-1,7
+1,7
@@
/* darkstat 3
*
* db.c: load and save in-memory database from/to file
/* darkstat 3
*
* db.c: load and save in-memory database from/to file
- * copyright (c) 2007-201
1
Ben Stewart, Emil Mikulic.
+ * copyright (c) 2007-201
2
Ben Stewart, Emil Mikulic.
*
* You may use, modify and redistribute this file under the terms of the
* GNU General Public License version 2. (see COPYING.GPL)
*
* You may use, modify and redistribute this file under the terms of the
* GNU General Public License version 2. (see COPYING.GPL)
@@
-27,9
+27,7
@@
static const unsigned char export_tag_hosts_ver1[] = {0xDA, 'H', 'S', 0x01};
static const unsigned char export_tag_graph_ver1[] = {0xDA, 'G', 'R', 0x01};
#ifndef swap64
static const unsigned char export_tag_graph_ver1[] = {0xDA, 'G', 'R', 0x01};
#ifndef swap64
-static inline uint64_t
-swap64(uint64_t _x)
-{
+static uint64_t swap64(uint64_t _x) {
/* this is __bswap64 from:
* $FreeBSD: src/sys/i386/include/endian.h,v 1.41$
*/
/* this is __bswap64 from:
* $FreeBSD: src/sys/i386/include/endian.h,v 1.41$
*/
@@
-40,17
+38,12
@@
swap64(uint64_t _x)
}
#endif
}
#endif
-uint64_t
-hton64(const uint64_t ho)
-{
- if (ntohs(0x1234) == 0x1234) return ho;
- else return swap64(ho);
-}
-
-uint64_t
-ntoh64(const uint64_t no)
-{
- return hton64(no);
+#define ntoh64 hton64
+static inline uint64_t hton64(const uint64_t ho) {
+ if (ntohs(0x1234) == 0x1234)
+ return ho;
+ else
+ return swap64(ho);
}
void
}
void