tevent: deprecate tevent_wrapper api again

Samba doesn't use it anymore and we don't want to
invite new users of that api without further discussion.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sat Jan 12 03:12:09 CET 2019 on sn-devel-144

diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index 62a8da3c1a16c18280298ed58a45b43e462dc321..ee4c2850230cf4672feb477de809b7f7078dda46 100644 (file)
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#define TEVENT_DEPRECATED 1
 #include "tevent.h"
 #include "system/filesys.h"
 #include "system/select.h"

diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index c1ed85109d9f99ec1997c985214b959ebb0243f9..2ec7330e249fe626c8d5fe18ea0d00f46e2be6b5 100644 (file)
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -2160,6 +2160,7 @@ bool tevent_register_backend(const char *name, const struct tevent_ops *ops);
 
 /* @} */
 
+#ifdef TEVENT_DEPRECATED
 /**
  * @defgroup tevent_wrapper_ops The tevent wrapper operation functions
  * @ingroup tevent
@@ -2271,6 +2272,7 @@ struct tevent_wrapper_ops {
  * @return                    The wrapper event context, NULL on error.
  *
  * @note Available as of tevent 0.9.37
+ * @note Deprecated as of tevent 0.9.38
  */
 struct tevent_context *tevent_context_wrapper_create(struct tevent_context *main_ev,
                                                TALLOC_CTX *mem_ctx,
@@ -2284,7 +2286,7 @@ struct tevent_context *_tevent_context_wrapper_create(struct tevent_context *mai
                                                void *pstate,
                                                size_t psize,
                                                const char *type,
-                                               const char *location);
+                                               const char *location) _DEPRECATED_;
 #define tevent_context_wrapper_create(main_ev, mem_ctx, ops, state, type) \
        _tevent_context_wrapper_create(main_ev, mem_ctx, ops, \
                                       state, sizeof(type), #type, __location__)
@@ -2300,8 +2302,9 @@ struct tevent_context *_tevent_context_wrapper_create(struct tevent_context *mai
  * @see tevent_context_wrapper_create()
  *
  * @note Available as of tevent 0.9.37
+ * @note Deprecated as of tevent 0.9.38
  */
-bool tevent_context_is_wrapper(struct tevent_context *ev);
+bool tevent_context_is_wrapper(struct tevent_context *ev) _DEPRECATED_;
 
 #ifdef DOXYGEN
 /**
@@ -2352,11 +2355,12 @@ bool tevent_context_is_wrapper(struct tevent_context *ev);
  * @see tevent_context_pop_use
  *
  * @note Available as of tevent 0.9.37
+ * @note Deprecated as of tevent 0.9.38
  */
 bool tevent_context_push_use(struct tevent_context *ev);
 #else
 bool _tevent_context_push_use(struct tevent_context *ev,
-                               const char *location);
+                               const char *location) _DEPRECATED_;
 #define tevent_context_push_use(ev) \
        _tevent_context_push_use(ev, __location__)
 #endif
@@ -2380,11 +2384,12 @@ bool _tevent_context_push_use(struct tevent_context *ev,
  * @see tevent_context_push_use
  *
  * @note Available as of tevent 0.9.37
+ * @note Deprecated as of tevent 0.9.38
  */
 void tevent_context_pop_use(struct tevent_context *ev);
 #else
 void _tevent_context_pop_use(struct tevent_context *ev,
-                              const char *location);
+                              const char *location) _DEPRECATED_;
 #define tevent_context_pop_use(ev) \
        _tevent_context_pop_use(ev, __location__)
 #endif
@@ -2406,11 +2411,13 @@ void _tevent_context_pop_use(struct tevent_context *ev,
  * @see tevent_context_wrapper_create
  *
  * @note Available as of tevent 0.9.37
+ * @note Deprecated as of tevent 0.9.38
  */
 bool tevent_context_same_loop(struct tevent_context *ev1,
-                             struct tevent_context *ev2);
+                             struct tevent_context *ev2) _DEPRECATED_;
 
 /* @} */
+#endif /* TEVENT_DEPRECATED */
 
 /**
  * @defgroup tevent_compat The tevent compatibility functions

diff --git a/lib/tevent/tevent_fd.c b/lib/tevent/tevent_fd.c
index b92c45f1dddec1f6b7ec5cc9c0387c9e0e71c0f9..a0557fedbecd6f699330e201b6388190b3efa058 100644 (file)
--- a/lib/tevent/tevent_fd.c
+++ b/lib/tevent/tevent_fd.c
@@ -24,6 +24,7 @@
 */
 
 #include "replace.h"
+#define TEVENT_DEPRECATED 1
 #include "tevent.h"
 #include "tevent_internal.h"
 #include "tevent_util.h"

diff --git a/lib/tevent/tevent_immediate.c b/lib/tevent/tevent_immediate.c
index ef7d8a566c0a6e8e1ccb6a0b08bd4af44cde5c5f..d7f8dccc3de92b3eefdaf68e913a94b651d8e528 100644 (file)
--- a/lib/tevent/tevent_immediate.c
+++ b/lib/tevent/tevent_immediate.c
@@ -24,6 +24,7 @@
 */
 
 #include "replace.h"
+#define TEVENT_DEPRECATED 1
 #include "tevent.h"
 #include "tevent_internal.h"
 #include "tevent_util.h"

diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index 5ca0b8d2ab11c388f72635ac0358c3beb6e3e3eb..7ebb13d6a39c3f2cd4d6af535784db537fa34b31 100644 (file)
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -26,6 +26,7 @@
 #include "replace.h"
 #include "system/filesys.h"
 #include "system/wait.h"
+#define TEVENT_DEPRECATED 1
 #include "tevent.h"
 #include "tevent_internal.h"
 #include "tevent_util.h"

diff --git a/lib/tevent/tevent_timed.c b/lib/tevent/tevent_timed.c
index b521f096c48a55fd9cf30b0f10dee59df39f0f59..a78d286a18714444f4327437d28c462441a2e392 100644 (file)
--- a/lib/tevent/tevent_timed.c
+++ b/lib/tevent/tevent_timed.c
@@ -26,6 +26,7 @@
 
 #include "replace.h"
 #include "system/time.h"
+#define TEVENT_DEPRECATED 1
 #include "tevent.h"
 #include "tevent_internal.h"
 #include "tevent_util.h"

diff --git a/lib/tevent/tevent_wrapper.c b/lib/tevent/tevent_wrapper.c
index ce07af9835880aef7b05eb1b48ce4261e1c4849d..deeb64ec177a8c4c48b90b6050998dde24c4240c 100644 (file)
--- a/lib/tevent/tevent_wrapper.c
+++ b/lib/tevent/tevent_wrapper.c
@@ -25,6 +25,7 @@
 #ifdef HAVE_PTHREAD
 #include "system/threads.h"
 #endif
+#define TEVENT_DEPRECATED 1
 #include "tevent.h"
 #include "tevent_internal.h"
 #include "tevent_util.h"