summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-19 00:06:14 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-19 00:06:14 +0200
commitdb0abee678f7b079b32d08334682fcee442e206b (patch)
treed168cc6be50028944d315551bb58cb5e3b4018ca /source4/lib
parent21897a0539e31c81bb7105fc5da7829a7d58f41e (diff)
parentba5fe7122586d8b382bf78f1e1cb5dbe4293c27b (diff)
downloadsamba-db0abee678f7b079b32d08334682fcee442e206b.tar.gz
samba-db0abee678f7b079b32d08334682fcee442e206b.tar.bz2
samba-db0abee678f7b079b32d08334682fcee442e206b.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/events/events.i2
-rw-r--r--source4/lib/events/events.py2
-rw-r--r--source4/lib/events/events_wrap.c17
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c4
-rw-r--r--source4/lib/registry/registry.i2
5 files changed, 18 insertions, 9 deletions
diff --git a/source4/lib/events/events.i b/source4/lib/events/events.i
index 5f790aeac5..8a0d9c4b6f 100644
--- a/source4/lib/events/events.i
+++ b/source4/lib/events/events.i
@@ -18,7 +18,7 @@
%module(docstring="Event management.",package="samba.events") events;
-%import "../talloc/talloc.i";
+%import "../../../lib/talloc/talloc.i";
%{
#include "events.h"
diff --git a/source4/lib/events/events.py b/source4/lib/events/events.py
index f217c29d78..c15ea8b9e5 100644
--- a/source4/lib/events/events.py
+++ b/source4/lib/events/events.py
@@ -1,5 +1,5 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.33
+# Version 1.3.36
#
# Don't modify this file, modify the SWIG interface instead.
diff --git a/source4/lib/events/events_wrap.c b/source4/lib/events/events_wrap.c
index ccaeab7ad6..335652101b 100644
--- a/source4/lib/events/events_wrap.c
+++ b/source4/lib/events/events_wrap.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.36
*
* This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make
@@ -52,6 +52,12 @@
# endif
#endif
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+# pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
#ifndef SWIGUNUSEDPARM
# ifdef __cplusplus
# define SWIGUNUSEDPARM(p)
@@ -2511,7 +2517,7 @@ static swig_module_info swig_module = {swig_types, 4, 0, 0, 0, 0};
#define SWIG_name "_events"
-#define SWIGVERSION 0x010335
+#define SWIGVERSION 0x010336
#define SWIG_VERSION SWIGVERSION
@@ -2623,10 +2629,10 @@ fail:
SWIGINTERN PyObject *_wrap_event_loop_once(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
event *arg1 = (event *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
+ int result;
if (!args) SWIG_fail;
swig_obj[0] = args;
@@ -2646,10 +2652,10 @@ fail:
SWIGINTERN PyObject *_wrap_event_loop_wait(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
event *arg1 = (event *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
+ int result;
if (!args) SWIG_fail;
swig_obj[0] = args;
@@ -2681,7 +2687,6 @@ SWIGINTERN PyObject *_wrap_delete_event(PyObject *SWIGUNUSEDPARM(self), PyObject
}
arg1 = (event *)(argp1);
delete_event(arg1);
-
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -2704,7 +2709,6 @@ SWIGINTERN PyObject *_wrap_event_context_init_byname(PyObject *SWIGUNUSEDPARM(se
PyObject *resultobj = 0;
TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
char *arg2 = (char *) 0 ;
- struct event_context *result = 0 ;
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
@@ -2712,6 +2716,7 @@ SWIGINTERN PyObject *_wrap_event_context_init_byname(PyObject *SWIGUNUSEDPARM(se
char * kwnames[] = {
(char *) "name", NULL
};
+ struct event_context *result = 0 ;
arg1 = NULL;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:event_context_init_byname",kwnames,&obj0)) SWIG_fail;
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 654574cd2f..4fea43c8c8 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -64,6 +64,10 @@ static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, con
struct ldb_context *ldb = talloc_get_type(tdb_get_logging_private(tdb), struct ldb_context);
enum ldb_debug_level ldb_level;
char *message;
+
+ if (ldb == NULL)
+ return;
+
va_start(ap, fmt);
message = talloc_vasprintf(ldb, fmt, ap);
va_end(ap);
diff --git a/source4/lib/registry/registry.i b/source4/lib/registry/registry.i
index c55197c3d0..fe3a81d889 100644
--- a/source4/lib/registry/registry.i
+++ b/source4/lib/registry/registry.i
@@ -43,7 +43,7 @@ typedef struct hive_key hive_key;
}
%import "stdint.i"
-%import "../../lib/talloc/talloc.i"
+%import "../../../lib/talloc/talloc.i"
%import "../../auth/credentials/credentials.i"
%import "../../param/param.i"
%import "../events/events.i"