summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/lib/registry/registry.i4
-rw-r--r--source4/lib/registry/registry_wrap.c9
-rw-r--r--source4/param/param.py1
-rw-r--r--source4/param/param_wrap.c25
4 files changed, 6 insertions, 33 deletions
diff --git a/source4/lib/registry/registry.i b/source4/lib/registry/registry.i
index b33b99c0c2..cbd5fe8793 100644
--- a/source4/lib/registry/registry.i
+++ b/source4/lib/registry/registry.i
@@ -63,11 +63,11 @@ const char *str_regtype(int type);
$result = SWIG_NewPointerObj(*$1, SWIGTYPE_p_registry_context, 0);
}
-%typemap(in,noblock=1) struct smb_iconv_convenience * {
+%typemap(in,noblock=1,numinputs=0) struct smb_iconv_convenience *ic {
$1 = py_iconv_convenience(NULL);
}
-%typemap(freearg,noblock=1) struct smb_iconv_convenience * {
+%typemap(freearg,noblock=1) struct smb_iconv_convenience *ic {
talloc_free($1);
}
diff --git a/source4/lib/registry/registry_wrap.c b/source4/lib/registry/registry_wrap.c
index 31711b6071..69b390f48a 100644
--- a/source4/lib/registry/registry_wrap.c
+++ b/source4/lib/registry/registry_wrap.c
@@ -3118,20 +3118,19 @@ SWIGINTERN PyObject *_wrap_reg_diff_apply(PyObject *SWIGUNUSEDPARM(self), PyObje
int alloc3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
char * kwnames[] = {
- (char *) "self",(char *) "ic",(char *) "filename", NULL
+ (char *) "self",(char *) "filename", NULL
};
WERROR result;
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:reg_diff_apply",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+ arg2 = py_iconv_convenience(NULL);
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:reg_diff_apply",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_registry_context, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "reg_diff_apply" "', argument " "1"" of type '" "reg *""'");
}
arg1 = (reg *)(argp1);
- arg2 = py_iconv_convenience(NULL);
- res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+ res3 = SWIG_AsCharPtrAndSize(obj1, &buf3, NULL, &alloc3);
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "reg_diff_apply" "', argument " "3"" of type '" "char const *""'");
}
diff --git a/source4/param/param.py b/source4/param/param.py
index 4117db6f28..8b68e7a9b3 100644
--- a/source4/param/param.py
+++ b/source4/param/param.py
@@ -263,5 +263,4 @@ param_section_swigregister = _param.param_section_swigregister
param_section_swigregister(param_section)
-cvar = _param.cvar
diff --git a/source4/param/param_wrap.c b/source4/param/param_wrap.c
index eef7a06605..23b3c17623 100644
--- a/source4/param/param_wrap.c
+++ b/source4/param/param_wrap.c
@@ -4144,29 +4144,6 @@ SWIGINTERN PyObject *param_section_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN int Swig_var_default_config_set(PyObject *_val) {
- {
- void *argp = 0;
- int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_loadparm_context, 0 );
- if (!SWIG_IsOK(res)) {
- SWIG_exception_fail(SWIG_ArgError(res), "in variable '""global_loadparm""' of type '""struct loadparm_context *""'");
- }
- global_loadparm = (struct loadparm_context *)(argp);
- }
- return 0;
-fail:
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_default_config_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(global_loadparm), SWIGTYPE_p_loadparm_context, 0 );
- return pyobj;
-}
-
-
static PyMethodDef SwigMethods[] = {
{ (char *)"new_LoadParm", (PyCFunction)_wrap_new_LoadParm, METH_NOARGS, NULL},
{ (char *)"LoadParm_default_service", (PyCFunction) _wrap_LoadParm_default_service, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -4845,7 +4822,5 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_InstallConstants(d,swig_const_table);
- PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
- SWIG_addvarlink(SWIG_globals(),(char*)"default_config",Swig_var_default_config_get, Swig_var_default_config_set);
}