Merge branch 'master' of /storage/git/netwatch

[netwatch.git] / lib / minilib.c

diff --git a/lib/minilib.c b/lib/minilib.c
index 232878b8478743c4a70d6574ef2785768d9e01e7..c1d36b6e143eb54cb929334b293c81fdb306e290 100644 (file)
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -1,14 +1,21 @@
 #include "console.h"
 #include <minilib.h>
 
 #include "console.h"
 #include <minilib.h>
 

-void memcpy(void *dest, 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;


@@ -43,7 +50,7 @@ int strcmp (const char *a2, const char *a1) {
        }
 }
 
        }
 }
 

-int strlen(char *c)
+int strlen(const char *c)

 {
        int l = 0;
        while (*(c++))
 {
        int l = 0;
        while (*(c++))


@@ -58,7 +65,7 @@ void strcpy(char *a2, const char *a1)
        } while (*(a1++));
 }
 
        } while (*(a1++));
 }
 

-void puts(char *c)
+void puts(const char *c)

 {
        putbytes(c, strlen(c));
 }
 {
        putbytes(c, strlen(c));
 }


@@ -82,4 +89,15 @@ void puthex(unsigned long l)
        puts(d);
 }
 
        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);
+}