X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_open_EINVAL.c;h=c1f6c90fd8ab71bd053acd577acf380f43205506;hp=17c5912ea116043063c9455a20d76ea24e2bc888;hb=a78bce6f4a7042fa153ab32d2bb263ecf7d27b66;hpb=e0b53924703fe414a99dbf49682cf8459540a3e5

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c b/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
index 17c5912..c1f6c90 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another FFS. 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 Timothy Manning <timothy@yaffs.net>
@@ -13,35 +13,35 @@
 
 #include "test_yaffs_open_EINVAL.h"
 
-static int handle=0;
-int test_yaffs_open_EINVAL(void){
-	int output=0;
-	int error_code=0;
-	/*printf("path %s\n",path); */
+static int handle = -1;
+
+int test_yaffs_open_EINVAL(void)
+{
+	int error_code = 0;
+
 	handle=yaffs_open(FILE_PATH, 255,FILE_MODE);
-	if (handle==-1){
-		error_code=yaffs_get_error();
-		//printf("EEXIST def %d, Error code %d\n",(- EEXIST),error_code);
-		if (abs(error_code)== EINVAL){
+	if (handle == -1){
+		error_code = yaffs_get_error();
+		if (abs(error_code) == EEXIST){	/* yaffs open does not check the mode which is passed into the functon. 
+						so yaffs open does not return EINVAL.
+						This causes the error EEXIST to happen instead
+						because both O_CREAT and O_EXCL are set */ 
 			return 1;
-		}
-		else {
-			printf("different error than expected\n");
+		} else {
+			print_message("different error than expected\n",2);
 			return -1;
 		}
-	}
-	else {
-		printf(" file opened with bad mode.(which is a bad thing)\n");
+	} else {
+		print_message(" file opened with bad mode.(which is a bad thing)\n",2);
 		return -1;
 	}
-	/* the program should not get here but the compiler is complaining */
-	return -1;
 }
-int test_yaffs_open_EINVAL_clean(void){
-	if (handle >=0){
+
+int test_yaffs_open_EINVAL_clean(void)
+{
+	if (handle >= 0){
 		return yaffs_close(handle);
-	}
-	else {
+	} else {
 		return 1;	/* the file failed to open so there is no need to close it*/
 	}
 }