Back out the wrong changes I made yesterday ...

diff --git a/source/torture/nbio.c b/source/torture/nbio.c
index bf9305f8e8993b7360bd3229dbc86d9486b9c4a9..2d519b40bacefdc57c228865dcfd3e05aed997b0 100644 (file)
--- a/source/torture/nbio.c
+++ b/source/torture/nbio.c
@@ -137,7 +137,7 @@ void nb_unlink(char *fname)
 
 
 void nb_createx(char *fname, 
-               unsigned create_options, unsigned create_disposition, int handle, int no_err)
+               unsigned create_options, unsigned create_disposition, int handle)
 {
        int fd, i;
        uint32 desired_access;
@@ -157,7 +157,7 @@ void nb_createx(char *fname,
        if (fd == -1 && handle != -1) {
                printf("ERROR: cli_nt_create_full failed for %s - %s\n",
                       fname, cli_errstr(c));
-               if (!no_err) exit(1);
+               exit(1);
        }
        if (fd != -1 && handle == -1) {
                printf("ERROR: cli_nt_create_full succeeded for %s\n", fname);
@@ -206,15 +206,10 @@ void nb_readx(int handle, int offset, int size, int ret_size)
        children[nbio_id].bytes_in += ret_size;
 }
 
-void nb_close(int handle, int no_err)
+void nb_close(int handle)
 {
        int i;
-       if (no_err) {
-               i = ne_find_handle(handle);
-               if (i < 0) return;
-       }
-       else
-               i = find_handle(handle);
+       i = find_handle(handle);
        if (!cli_close(c, ftable[i].fd)) {
                printf("(%d) close failed on handle %d\n", line_count, handle);
                exit(1);

diff --git a/source/torture/torture.c b/source/torture/torture.c
index cce39d21129102d0a02198c31e7ae54f12f2f0a2..23624d07333a51aa78f8c9f234fde13b882e1110 100644 (file)
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -707,9 +707,9 @@ static BOOL run_netbench(int client)
 
                if (!strcmp(params[0],"NTCreateX")) {
                        nb_createx(params[1], ival(params[2]), ival(params[3]), 
-                                  ival(params[4]),ival(params[5]));
+                                  ival(params[4]));
                } else if (!strcmp(params[0],"Close")) {
-                       nb_close(ival(params[1]),ival(params[2]));
+                       nb_close(ival(params[1]));
                } else if (!strcmp(params[0],"Rename")) {
                        nb_rename(params[1], params[2]);
                } else if (!strcmp(params[0],"Unlink")) {