Move htonll() into header.c and make static, not needed elsewhere

diff --git a/lib/header.c b/lib/header.c
index a88f205..893d6f9 100644 (file)
--- a/lib/header.c
+++ b/lib/header.c
@@ -86,6 +86,15 @@ typedef int (*headerTagTagFunction) (Header h, rpmtd td, headerGetFlags hgflags)
 
 extern void *rpmHeaderTagFunc(rpmTag tag);
 
+/* Convert a 64bit value to network byte order. */
+static uint64_t htonll( uint64_t n ) {
+    uint32_t *i = (uint32_t*)&n;
+    uint32_t b = i[0];
+    i[0] = htonl(i[1]);
+    i[1] = htonl(b);
+    return n;
+}
+
 Header headerLink(Header h)
 {
     if (h == NULL) return NULL;

diff --git a/lib/header_internal.c b/lib/header_internal.c
index 44578d7..d3537f9 100644 (file)
--- a/lib/header_internal.c
+++ b/lib/header_internal.c
@@ -9,11 +9,4 @@
 
 #include "debug.h"
 
-uint64_t htonll( uint64_t n ) {
-    uint32_t *i = (uint32_t*)&n;
-    uint32_t b = i[0];
-    i[0] = htonl(i[1]);
-    i[1] = htonl(b);
-    return n;
-}
 

diff --git a/lib/header_internal.h b/lib/header_internal.h
index a228603..d9cb67e 100644 (file)
--- a/lib/header_internal.h
+++ b/lib/header_internal.h
@@ -92,14 +92,6 @@ extern "C" {
 #endif
 
 /** \ingroup header
- * Conver a 64bit value to network byte order.
- * @param n            a number
- * @return             number in network byte order
- */
-RPM_GNUC_INTERNAL
-uint64_t htonll( uint64_t n );
-
-/** \ingroup header
  * Set header instance (rpmdb record number)
  * @param h            header
  * @param instance     record number