Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / lib / minilib.c

diff --git a/lib/minilib.c b/lib/minilib.c
index 48d79484dd5cda244405a0b30c4e2555c733716a..c1d36b6e143eb54cb929334b293c81fdb306e290 100644 (file)
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -3,12 +3,19 @@
 
 void memcpy(void *dest, const void *src, int bytes)
 {
 
 void memcpy(void *dest, const void *src, int bytes)
 {

-       char * cdest = dest;
-       char * csrc = src;
+       char *cdest = dest;
+       const char *csrc = src;

        while (bytes--)
                *(cdest++) = *(csrc++);
 }
 
        while (bytes--)
                *(cdest++) = *(csrc++);
 }
 

+void memset(void *dest, int data, int bytes)
+{
+       unsigned char *cdest = dest;
+       while (bytes--)
+               *(cdest++) = (unsigned char)data;
+}
+

 void memmove(void *dest, void *src, int bytes)
 {
        char * cdest = dest;
 void memmove(void *dest, void *src, int bytes)
 {
        char * cdest = dest;


@@ -81,3 +88,16 @@ void puthex(unsigned long l)
        tohex(d, l);
        puts(d);
 }
        tohex(d, l);
        puts(d);
 }

+
+unsigned short htons(unsigned short in)
+{
+       return (in >> 8) | (in << 8);
+}
+
+unsigned int htonl(unsigned int in)
+{
+       return ((in & 0xff) << 24) |
+              ((in & 0xff00) << 8) |
+              ((in & 0xff0000UL) >> 8) |
+              ((in & 0xff000000UL) >> 24);
+}