yaffs: Remove a whole lot of function wrappers and forward declarations

[yaffs2.git] / yaffs_nameval.c

diff --git a/yaffs_nameval.c b/yaffs_nameval.c
index d8c548a1b832e3c10b7c7ed1cc45d6e66bf29bac..daa36f989d318bf6dd5684973576a875144d455f 100644 (file)
--- a/yaffs_nameval.c
+++ b/yaffs_nameval.c
@@ -37,7 +37,7 @@ static int nval_find(const char *xb, int xb_size, const YCHAR * name,
 
        memcpy(&size, xb, sizeof(int));
        while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
-               if (yaffs_strncmp
+               if (strncmp
                    ((YCHAR *) (xb + pos + sizeof(int)), name, size) == 0) {
                        if (exist_size)
                                *exist_size = size;
@@ -90,7 +90,7 @@ int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf,
             int bsize, int flags)
 {
        int pos;
-       int namelen = yaffs_strnlen(name, xb_size);
+       int namelen = strnlen(name, xb_size);
        int reclen;
        int size_exist = 0;
        int space;
@@ -120,7 +120,7 @@ int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf,
 
        memcpy(xb + pos, &reclen, sizeof(int));
        pos += sizeof(int);
-       yaffs_strncpy((YCHAR *) (xb + pos), name, reclen);
+       strncpy((YCHAR *) (xb + pos), name, reclen);
        pos += (namelen + 1);
        memcpy(xb + pos, buf, bsize);
        return 0;
@@ -172,7 +172,7 @@ int nval_list(const char *xb, int xb_size, char *buf, int bsize)
               && !filled) {
                pos += sizeof(int);
                size -= sizeof(int);
-               name_len = yaffs_strnlen((YCHAR *) (xb + pos), size);
+               name_len = strnlen((YCHAR *) (xb + pos), size);
                if (ncopied + name_len + 1 < bsize) {
                        memcpy(buf, xb + pos, name_len * sizeof(YCHAR));
                        buf += name_len;