X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nameval.c;h=daa36f989d318bf6dd5684973576a875144d455f;hp=d7cb72aa00a6bf94ea9d275f688e6b879e14ea93;hb=fe192b14d52d6c7d4722402686dcb553153916c3;hpb=3ecea787c3d99a5e13bf3b826dd3ad772fbad810

diff --git a/yaffs_nameval.c b/yaffs_nameval.c
index d7cb72a..daa36f9 100644
--- 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;
@@ -81,15 +81,16 @@ int nval_del(char *xb, int xb_size, const YCHAR * name)
 		memcpy(xb + pos, xb + pos + size, xb_size - (pos + size));
 		memset(xb + (xb_size - size), 0, size);
 		return 0;
-	} else
+	} else {
 		return -ENODATA;
+        }
 }
 
 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;
@@ -119,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;
@@ -171,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;
@@ -182,8 +183,9 @@ int nval_list(const char *xb, int xb_size, char *buf, int bsize)
 				buf++;
 			}
 			ncopied += (name_len + 1);
-		} else
+		} else {
 			filled = 1;
+                }
 		pos += size;
 		if (pos < xb_size - sizeof(int))
 			memcpy(&size, xb + pos, sizeof(int));