From a8035258631d2773942c0dfab09c2741c2245390 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 24 Oct 2008 15:30:43 +0200 Subject: Regenerate SWIG files. --- source4/lib/registry/registry.i | 4 ++-- source4/lib/registry/registry_wrap.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'source4/lib') 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 *""'"); } -- cgit