Changeset 988 for vendor/current/source4/lib/events

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/lib/events

Files:

• events.h (modified) (1 diff)
• tevent_s4.c (modified) (2 diffs)

vendor/current/source4/lib/events/events.h

@@ -1 +1 @@
 #ifndef __LIB_EVENTS_H__
 #define __LIB_EVENTS_H__
-#define TEVENT_COMPAT_DEFINES 1
 #include <tevent.h>
 struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
-struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx) _DEPRECATED_;
 void s4_event_context_set_default(struct tevent_context *ev);
 #endif /* __LIB_EVENTS_H__ */

vendor/current/source4/lib/events/tevent_s4.c

@@ -22 +22 @@
 
 /*
-  this is used to catch debug messages from events
-*/
-static void ev_wrap_debug(void *context, enum tevent_debug_level level,
-                          const char *fmt, va_list ap)  PRINTF_ATTRIBUTE(3,0);
-
-static void ev_wrap_debug(void *context, enum tevent_debug_level level,
-                          const char *fmt, va_list ap)
-{
-        int samba_level = -1;
-        char *s = NULL;
-        switch (level) {
-        case TEVENT_DEBUG_FATAL:
-                samba_level = 0;
-                break;
-        case TEVENT_DEBUG_ERROR:
-                samba_level = 1;
-                break;
-        case TEVENT_DEBUG_WARNING:
-                samba_level = 2;
-                break;
-        case TEVENT_DEBUG_TRACE:
-                samba_level = 50;
-                break;
-
-        };
-        vasprintf(&s, fmt, ap);
-        if (!s) return;
-        DEBUG(samba_level, ("tevent: %s", s));
-        free(s);
-}
-
-/*
   create a event_context structure. This must be the first events
   call, and all subsequent calls pass this event_context as the first
@@ -66 +34 @@
         ev = tevent_context_init_byname(mem_ctx, NULL);
         if (ev) {
-                tevent_set_debug(ev, ev_wrap_debug, NULL);
+                samba_tevent_set_debug(ev, "s4_tevent");
                 tevent_loop_allow_nesting(ev);
         }