s3: Remove tevent_wait code. The last user was fsp->deferred_close.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Mon Mar 23 12:06:45 UTC 2020 on sn-devel-184

diff --git a/source3/lib/tevent_wait.c b/source3/lib/tevent_wait.c
deleted file mode 100644 (file)
index 31bb581..0000000
--- a/source3/lib/tevent_wait.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Implement a send/recv interface to wait for an external trigger
-   Copyright (C) Volker Lendecke 2012
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lib/replace/replace.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "tevent_wait.h"
-#include "lib/util/tevent_unix.h"
-
-struct tevent_wait_state {
-       uint8_t _dummy_;
-};
-
-struct tevent_req *tevent_wait_send(TALLOC_CTX *mem_ctx,
-                                   struct tevent_context *ev)
-{
-       struct tevent_req *req;
-       struct tevent_wait_state *state;
-
-       req = tevent_req_create(mem_ctx, &state, struct tevent_wait_state);
-       if (req == NULL) {
-               return NULL;
-       }
-
-       tevent_req_defer_callback(req, ev);
-       return req;
-}
-
-void tevent_wait_done(struct tevent_req *req)
-{
-       if (req == NULL) {
-               return;
-       }
-
-       tevent_req_done(req);
-}
-
-int tevent_wait_recv(struct tevent_req *req)
-{
-       return tevent_req_simple_recv_unix(req);
-}

diff --git a/source3/lib/tevent_wait.h b/source3/lib/tevent_wait.h
deleted file mode 100644 (file)
index 97b7491..0000000
--- a/source3/lib/tevent_wait.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Implement a send/recv interface to wait for an external trigger
-   Copyright (C) Volker Lendecke 2012
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _TEVENT_WAIT_H
-#define _TEVENT_WAIT_H
-
-#include "talloc.h"
-#include "tevent.h"
-
-/*
- * Just wait for getting a tevent_wait_done. tevent_wait_done can deal with a
- * NULL request.
- */
-
-struct tevent_req *tevent_wait_send(TALLOC_CTX *mem_ctx,
-                                   struct tevent_context *ev);
-int tevent_wait_recv(struct tevent_req *req);
-
-void tevent_wait_done(struct tevent_req *req);
-
-#endif /* _TEVENT_WAIT_H */

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index 30a8c0eb04f98c1de9fbc43877eeefbc5f905fea..f007383702088b8ff92a1c3b1abbaba53b868f75 100644 (file)
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -23,7 +23,6 @@
 #include "smbd/globals.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "../lib/util/tevent_unix.h"
-#include "lib/tevent_wait.h"
 
 /****************************************************************************
  The buffer we keep around whilst an aio request is in process.

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 15eeab3b8bd83ad5f11b94bc7d77328f7b41deb4..58bc7d05eab3a61d6e1f6e3964e620c061d59d0c 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -41,7 +41,6 @@
 #include "auth.h"
 #include "smbprofile.h"
 #include "../lib/tsocket/tsocket.h"
-#include "lib/tevent_wait.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "libcli/smb/smb_signing.h"
 #include "lib/util/sys_rw_data.h"

diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index 097786178840526b95b7ce09f5868fbbb90c0dca..f597a0f842fb04bd41f6bf2749a56bd006478007 100644 (file)
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -23,7 +23,6 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../lib/util/tevent_ntstatus.h"
-#include "lib/tevent_wait.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_SMB2

diff --git a/source3/wscript_build b/source3/wscript_build
index 68f2c14ebf451ca98a8a7f59ac87f3a2048957bd..8fd13bf83763493525960c9d14f9d553e3f73e6d 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -408,7 +408,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                           lib/ldap_escape.c
                           lib/system_smbd.c
                           lib/audit.c
-                          lib/tevent_wait.c
                           lib/idmap_cache.c
                           lib/namemap_cache.c
                           lib/util_ea.c