X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Ftest_yaffs_unlink_EISDIR.c;h=37ddb0e8f7346b9728e156a48dead84253e6abb9;hp=80c8f40ba883135231a01f845d12897c5e92b925;hb=00ebf30805d631cd9bb3155aa249705b3a5777f5;hpb=1c8604a29f8ca073e1f5129c58e201a4b42bc192

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c
index 80c8f40..37ddb0e 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlink_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,33 @@
 
 /*EISDIR is caused by trying to unlink a directory */
 
-static int handle=0;
-int test_yaffs_unlink_EISDIR(void){
-	int output=0;
+static int handle=-1;
+
+int test_yaffs_unlink_EISDIR(void)
+{
 	int error_code=0;
-	/*printf("path %s\n",path); */
+
 	handle=yaffs_unlink(YAFFS_MOUNT_POINT);
 	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("directory unlinked opened.(which is a bad thing)\n");
+	else {
+		print_message("directory unlinked 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_unlink_EISDIR_clean(void){
+int test_yaffs_unlink_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*/
 	}
 }