X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_open_EEXIST.c;h=5bcbf2b87d0f2b12f75c85a51a46cc8fd292595d;hp=90ba455eb9566f0190b3066076ba43cb7f7a5f2c;hb=137f935f6d622bffdef2fece0c5194e85f5174e9;hpb=6cb99e93f72bbb066c5abb4ab2cc0cd79f56a4f3

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c b/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
index 90ba455..5bcbf2b 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
@@ -13,35 +13,32 @@
 
 #include "test_yaffs_open_EEXIST.h"
 
-static int handle=0;
-int test_yaffs_open_EEXIST(void){
-	int output=0;
-	int error_code=0;
-	/*printf("path %s\n",path); */
-	handle=yaffs_open(FILE_PATH, O_CREAT | O_EXCL | O_TRUNC| O_RDWR ,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)== EEXIST){
+static int handle = -1;
+
+int test_yaffs_open_EEXIST(void)
+{
+	int error_code = 0;
+
+	handle = yaffs_open(FILE_PATH, O_CREAT | O_EXCL | O_TRUNC| O_RDWR ,FILE_MODE );
+	if (handle == -1){
+		error_code = yaffs_get_error();
+		if (abs(error_code) == EEXIST){
 			return 1;
-		}
-		else {
-			printf("different error than expected\n");
+		} else {
+			print_message("different error than expected\n",2);
 			return -1;
 		}
-	}
-	else if (output >=0){
-		printf("non existant file opened.(which is a bad thing)\n");
+	} else {
+		print_message("non existant file opened.(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_EEXIST_clean(void){
+
+int test_yaffs_open_EEXIST_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*/
 	}
 }