swig: properly wrap output parameters

By using %apply rather than overriding, we
can make the swig code smaller, generate
less code and fewer warnings.

Acked-by: Darren Hart <dvhltc@us.ibm.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

2 files changed, 5 insertions, 27 deletions

diff --git a/ctracecmd.i b/ctracecmd.i
index 51e98d5..f3daad2 100644
--- a/ctracecmd.i
+++ b/ctracecmd.i
@@ -5,38 +5,14 @@
 
 %apply Pointer NONNULL { struct tracecmd_input *handle };
 %apply Pointer NONNULL { struct pevent *pevent };
-
-/* return a (rec,cpu) tuple in python */
-extern struct record *tracecmd_read_at(struct tracecmd_input *handle, 
-                                       unsigned long long offset,
-                                       int *OUTPUT);
+%apply unsigned long long *OUTPUT {unsigned long long *}
+%apply int *OUTPUT {int *}
 
 
 %{
 #include "trace-cmd.h"
 %}
 
-
-/* return python longs from unsigned long long functions */
-%typemap(out) unsigned long long {
-$result = PyLong_FromUnsignedLongLong((unsigned long long) $1);
-}
-
-
-%inline %{
-PyObject *pevent_read_number_field_py(struct format_field *f, void *data)
-{
-        unsigned long long val;
-        int ret;
-
-        ret = pevent_read_number_field(f, data, &val);
-        if (ret)
-                Py_RETURN_NONE;
-        else
-                return PyLong_FromUnsignedLongLong(val);
-}
-%}
-
 %ignore trace_seq_vprintf;
 
 /* SWIG can't grok these, define them to nothing */
diff --git a/tracecmd.py b/tracecmd.py
index cf0a275..26f3ac2 100644
--- a/tracecmd.py
+++ b/tracecmd.py
@@ -71,7 +71,9 @@ class Event(object):
 
     def num_field(self, name):
         f = pevent_find_any_field(self._format, name)
-        val = pevent_read_number_field_py(f, record_data_get(self._record))
+        ret, val = pevent_read_number_field(f, record_data_get(self._record))
+        if ret:
+            return None
         return val