Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / direct / timothy_tests / quick_tests / test_yaffs_open_ENOENT.c

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
index 259f96436185dd32c17c8abf3dbc916e363a42f6..b5a8dd71b8aaed1be85ed82601be8ad208d411fd 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.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,29 +13,31 @@
 
 #include "test_yaffs_open_ENOENT.h"
 
-static int handle=0;
-int test_yaffs_open_ENOENT(void){
-       int output=0;
-       int error_code=0;
+static int handle = -1;
+
+int test_yaffs_open_ENOENT(void)
+{
+       int output = 0;
+       int error_code = 0;
        /*printf("path %s\n",path); */
-       handle=yaffs_open("/yaffs2/non_existant_file", O_TRUNC| O_RDWR,FILE_MODE );
-       if (handle==-1){
-               error_code=yaffs_get_error();
-               if (abs(error_code)==ENOENT){
+       handle = yaffs_open("/yaffs2/non_existant_file", O_TRUNC| O_RDWR,FILE_MODE );
+       if (handle == -1){
+               error_code = yaffs_get_error();
+               if (abs(error_code) == ENOENT){
                        return 1;
                }
                else {
-                       printf("different error than expected\n");
+                       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;
        }
-
 }
-int test_yaffs_open_ENOENT_clean(void){
+
+int test_yaffs_open_ENOENT_clean(void)
+{
        if (handle >=0){
                return yaffs_close(handle);
        }