yaffs: Update year to 2011 in copyrights etc.

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

diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read.c b/direct/timothy_tests/quick_tests/test_yaffs_read.c
index bdd58cf1148fe87f781c2209506e707ca74ae875..1bcf4034fccca8bab6147b13c8103d416b856e29 100644 (file)
--- a/direct/timothy_tests/quick_tests/test_yaffs_read.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_read.c
@@ -1,37 +1,46 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Timothy Manning <timothy@yaffs.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
 #include "test_yaffs_read.h"
 
-static int handle=0;
+static int handle=-1;
 
-int test_yaffs_read(void){
-       handle=test_yaffs_open();
-       char text[20]="\0";
+int test_yaffs_read(void)
+{
+       char text[2000] = "\0";
        int output=0;
-       printf("handle %d\n",handle);
-       if (handle>0){
+
+       handle = test_yaffs_open();
+       if (handle>=0){
                output=yaffs_read(handle, text, FILE_TEXT_NBYTES);
-               printf("yaffs_test_read output: %d\n",output);
-               printf("text in file is: %s\n",text);
-               if (output>0){ 
-                       if (text==FILE_TEXT){
-                               return 1;
-                       }
-                       else {
-                               printf("returned text does not match the the expected text that should be in the file\n");
-                               return -1;
-                       }
-               }
-               else{
-                       printf("error reading file\n");
+               if (output>=0){ 
+                       return 1;
+               } else{
+                       print_message("error reading file\n", 2);
                        return -1;
                }
-       }
-       else {
-               printf("error opening file\n");
+       } else {
+               print_message("error opening file\n", 2);
                return -1;
        }
-       
 }
 
-int test_yaffs_read_clean(void){
-       return yaffs_close(handle);
+int test_yaffs_read_clean(void)
+{
+       if (handle>=0){
+               return yaffs_close(handle);
+       }
+       else {
+               return 1; /* no handle was opened so there is no need to close a handle */
+       }       
 }