Set up new version of case insensitive code using sed

[yaffs2.git] / direct / ydirectenv.h

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 3c6ddf566a8b3d713bc0019c19d37e5e933ab4d1..fbf460664229e1034cd58c80f473d360e7105c29 100644 (file)
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -29,14 +29,26 @@
 #include "yaffs_hweight.h"
 
 #include "assert.h"
-#define YBUG() assert(0)
-//#define YBUG() do { *((int *)0) =1;} while(0)
+#define BUG() assert(0)
+//#define BUG() do { *((int *)0) =1;} while(0)
 
 
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x) x
 
+#define yaffs_strcat(a,b)    strcat(a,b)
+#define yaffs_strcpy(a,b)    strcpy(a,b)
+#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
+#define yaffs_strnlen(s,m)           strnlen(s,m)
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+#define yaffs_strcmp(a,b) strcasecmp(a,b)
+#define yaffs_strncmp(a,b,c) strncasecmp(a,b,c)
+#else
+#define yaffs_strcmp(a,b) strcmp(a,b)
+#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
+#endif
+
 #define hweight8(x)    yaffs_hweight8(x)
 #define hweight32(x)   yaffs_hweight32(x)
 
@@ -61,7 +73,7 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 #define cond_resched()  do {} while(0)
 
 #define yaffs_trace(msk, fmt, ...) do { \
-       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+       if(yaffs_trace_mask & (msk)) \
                printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)