[Selinux-commits] SF.net SVN: selinux: [2637] trunk/libselinux

[<ssm...@us...>]

Revision: 2637
          http://selinux.svn.sourceforge.net/selinux/?rev=2637&view=rev
Author:   ssmalley
Date:     2007-10-05 06:53:14 -0700 (Fri, 05 Oct 2007)

Log Message:
-----------
Wrap attribute with #ifdef __GNUC__ to avoid breaking swig.
Regenerate python bindings via make swigify.

Modified Paths:
--------------
    trunk/libselinux/include/selinux/selinux.h
    trunk/libselinux/src/selinux.py
    trunk/libselinux/src/selinuxswig_wrap.c

Modified: trunk/libselinux/include/selinux/selinux.h
===================================================================
--- trunk/libselinux/include/selinux/selinux.h	2007-10-05 13:46:54 UTC (rev 2636)
+++ trunk/libselinux/include/selinux/selinux.h	2007-10-05 13:53:14 UTC (rev 2637)
@@ -142,7 +142,10 @@
 union selinux_callback {
 	/* log the printf-style format and arguments,
 	   with the type code indicating the type of message */
-	int __attribute__((format(printf, 2, 3)))
+	int 
+#ifdef __GNUC__
+__attribute__ ((format(printf, 2, 3)))
+#endif
 	(*func_log) (int type, const char *fmt, ...);
 	/* store a string representation of auditdata (corresponding
 	   to the given security class) into msgbuf. */

Modified: trunk/libselinux/src/selinux.py
===================================================================
--- trunk/libselinux/src/selinux.py	2007-10-05 13:46:54 UTC (rev 2636)
+++ trunk/libselinux/src/selinux.py	2007-10-05 13:53:14 UTC (rev 2637)
@@ -166,6 +166,7 @@
 SELINUX_CB_LOG = _selinux.SELINUX_CB_LOG
 SELINUX_CB_AUDIT = _selinux.SELINUX_CB_AUDIT
 SELINUX_CB_VALIDATE = _selinux.SELINUX_CB_VALIDATE
+selinux_get_callback = _selinux.selinux_get_callback
 selinux_set_callback = _selinux.selinux_set_callback
 SELINUX_ERROR = _selinux.SELINUX_ERROR
 SELINUX_WARNING = _selinux.SELINUX_WARNING

Modified: trunk/libselinux/src/selinuxswig_wrap.c
===================================================================
--- trunk/libselinux/src/selinuxswig_wrap.c	2007-10-05 13:46:54 UTC (rev 2636)
+++ trunk/libselinux/src/selinuxswig_wrap.c	2007-10-05 13:53:14 UTC (rev 2637)
@@ -4651,6 +4651,28 @@
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_selinux_get_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  union selinux_callback result;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:selinux_get_callback",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "selinux_get_callback" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  result = selinux_get_callback(arg1);
+  resultobj = SWIG_NewPointerObj((union selinux_callback *)memcpy((union selinux_callback *)malloc(sizeof(union selinux_callback)),&result,sizeof(union selinux_callback)), SWIGTYPE_p_selinux_callback, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_selinux_set_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
@@ -8011,6 +8033,7 @@
 	 { (char *)"new_selinux_callback", _wrap_new_selinux_callback, METH_VARARGS, NULL},
 	 { (char *)"delete_selinux_callback", _wrap_delete_selinux_callback, METH_VARARGS, NULL},
 	 { (char *)"selinux_callback_swigregister", selinux_callback_swigregister, METH_VARARGS, NULL},
+	 { (char *)"selinux_get_callback", _wrap_selinux_get_callback, METH_VARARGS, NULL},
 	 { (char *)"selinux_set_callback", _wrap_selinux_set_callback, METH_VARARGS, NULL},
 	 { (char *)"security_compute_av", _wrap_security_compute_av, METH_VARARGS, NULL},
 	 { (char *)"security_compute_av_raw", _wrap_security_compute_av_raw, METH_VARARGS, NULL},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.