summaryrefslogtreecommitdiff
path: root/yaffs_nameval.c
diff options
context:
space:
mode:
authorCharles Manning <cdhmanning@gmail.com>2010-12-07 13:45:55 +1300
committerCharles Manning <cdhmanning@gmail.com>2010-12-07 13:45:55 +1300
commitfb1a7ee223619260cfd9b6366fd78747cc572cd5 (patch)
tree17b1408b4ecfa48a9ef57fa27663244c9483c3f0 /yaffs_nameval.c
parent84f122f301b6a27295641fcbde3a6fbcfea78a99 (diff)
yaffs: Remove a whole lot of function wrappers and forward declarations
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'yaffs_nameval.c')
-rw-r--r--yaffs_nameval.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/yaffs_nameval.c b/yaffs_nameval.c
index d8c548a..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;
@@ -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;