Changeset 2398 for libcacaTweet

Timestamp:

Jun 15, 2008, 2:28:14 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Remove htons() and htonl() from kernel mode: we use our custom hton16() and hton32() implementations everywhere instead, except in cacaserver which requires <arpa/inet.h> stuff anyway.

Location:

libcaca/trunk

Files:

• kernel/kernel.c (modified) (1 diff)
• stubs.h (modified) (2 diffs)
• tools/makefont.c (modified) (2 diffs)

libcaca/trunk/kernel/kernel.c

@@ -383 +383 @@
 
 /* errno.h stuff */
+
 int errno = 0;
 
-/* arpa/inet.h functions */
-
-/* XXX FIXME Converts only from little endian to big endian (x86) */
-unsigned int htonl(unsigned int hostlong)
-{
-    return ((hostlong&0xFFFF0000)>>16)|((hostlong&0x0000FFFFFF)<<16);
-}
-
-/* XXX FIXME Converts only from little endian to big endian (x86) */
-unsigned short htons(unsigned short hostlong)
-{
-    return ((hostlong&0xFF00)>>8)|((hostlong&0x00FF)<<8);
-}
-
 #endif /* __KERNEL__ */

libcaca/trunk/stubs.h

@@ -51 +51 @@
 
 /* hton16() and hton32() */
-#if defined HAVE_HTONS
-#   if defined __KERNEL__
-        /* Nothing to do */
-#   elif defined HAVE_ARPA_INET_H
+#if defined HAVE_HTONS && !defined __KERNEL__
+#   if defined HAVE_ARPA_INET_H
 #       include <arpa/inet.h>
 #   elif defined HAVE_NETINET_IN_H
@@ -62 +60 @@
 #   define hton32 htonl
 #else
-#   if defined HAVE_ENDIAN_H
+#   if defined __KERNEL__
+        /* Nothing to do */
+#   elif defined HAVE_ENDIAN_H
 #       include <endian.h>
 #   endif

libcaca/trunk/tools/makefont.c

@@ -437 +437 @@
 static int printf_u32(char const *fmt, uint32_t i)
 {
-    uint32_t ni = htonl(i);
+    uint32_t ni = hton32(i);
     return printf_hex(fmt, (uint8_t *)&ni, 4);
 }
@@ -443 +443 @@
 static int printf_u16(char const *fmt, uint16_t i)
 {
-    uint16_t ni = htons(i);
+    uint16_t ni = hton16(i);
     return printf_hex(fmt, (uint8_t *)&ni, 2);
 }