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

[netwatch.git] / lib / minilib.c

diff --git a/lib/minilib.c b/lib/minilib.c
index 595341e192a18fa981bbeebe03eef3abd1954700..677c77ab614a9a4ffc235c0be3e848b2d3640e8c 100644 (file)
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -1,10 +1,10 @@
 #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++);
 }


@@ -43,7 +43,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 +58,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));
 }


@@ -81,3 +81,8 @@ 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);
+}