X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_open_EISDIR.c;h=3246a52fe0ca87b7a7148a755750edfa0dc61338;hp=0891aaa326da8317e0aeba74a5c12a5cb46c5224;hb=121c055437f23d9d6bc7b57d36ecf128b447013f;hpb=a11dd4924d16a4c3d6df13a4182f7729a1478a53

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
index 0891aaa..3246a52 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.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>
@@ -15,35 +15,32 @@
 
 /*EISDIR is caused by trying to open a directory */
 
-static int handle=0;
-int test_yaffs_open_EISDIR(void){
-	int output=0;
+static int handle = -1;
+
+int test_yaffs_open_EISDIR(void)
+{
 	int error_code=0;
-	/*printf("path %s\n",path); */
+
 	handle=yaffs_open(YAFFS_MOUNT_POINT, O_CREAT | O_TRUNC| O_RDWR ,FILE_MODE );
-	if (handle==-1){
+	if (handle == -1){
 		error_code=yaffs_get_error();
-		printf("EISDIR def %d, Error code %d\n", EISDIR,error_code);
 		if (abs(error_code)== EISDIR){
 			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 directory opened.(which is a bad thing)\n");
+	} else {
+		print_message("non existant directory 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_EISDIR_clean(void){
+int test_yaffs_open_EISDIR_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*/
 	}
 }