X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_close_EBADF.c;h=a058d98467a5f662da669021d004b0e30f5819c2;hp=5f322fc6a2ac0bec3f12120d98e3114a36790ca5;hb=aed1065488d0c27e1654091636e4cfe5fb8e6951;hpb=6cb99e93f72bbb066c5abb4ab2cc0cd79f56a4f3

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.c b/direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.c
index 5f322fc..a058d98 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.c
@@ -15,48 +15,50 @@
 
 #include "test_yaffs_open.h"
 
-static int handle=0;
-
-int test_yaffs_close_EBADF(void){
-	int output=0;
-	int error_code=0;
-	handle=test_yaffs_open();
-	if (handle>=0){
-		output=yaffs_close(handle);
-		if (output>=0){
-			output=yaffs_close(handle);
-			if (output<0){
-				/*error has happened */
-				error_code=yaffs_get_error();
-				//printf("EBADF def %d, Error code %d\n",(- EBADF),error_code);
-				if (abs(error_code)== EBADF){
+static int handle = -1;
+
+int test_yaffs_close_EBADF(void)
+{
+	int output = 0;
+	int error_code = 0;
+
+	handle = test_yaffs_open();
+	if (handle >= 0){
+		output = yaffs_close(handle);
+		if (output >= 0){
+			output = yaffs_close(handle);
+			if (output < 0){
+				error_code = yaffs_get_error();
+				if (abs(error_code) == EBADF){
+					handle =-1;
 					return 1;
-				}
-				else {
-					printf("different error than expected\n");
+				} else {
+					print_message("different error than expected\n",2);
 					return -1;
 				}
-			}
-			else {
-				printf("closed the same handle twice. (which is a bad thing)\n");
+			} else {
+				print_message("closed the same handle twice. (which is a bad thing)\n", 2);
 				return -1;
 			}
-		}
-		else {
-			printf("failed to close the handle the firs time\n");
+		} else {
+			print_message("failed to close the handle the firs time\n", 2);
 			return -1;
 		}	
-	}
-	else {
-		printf("failed to open file\n");
+	} else {
+		print_message("failed to open file\n", 2);
 		return -1;
 	}
 
 }
 
 
-int test_yaffs_close_EBADF_clean(void){
-	/* there is nothing that needs to be recreated */	
-	return 1;
+int test_yaffs_close_EBADF_clean(void)
+{
+	if (handle >= 0){
+		printf("handle %d\n",handle);
+		return yaffs_close(handle);
+	} else {
+		return 1;
+	}
 }