From: Taeung Song <treeze.taeung@gmail.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH] trace-cmd: Fix a warning about incompatible pointer type of load_plugin()
Date: Mon, 24 Apr 2017 22:43:31 +0900 [thread overview]
Message-ID: <1493041411-28428-1-git-send-email-treeze.taeung@gmail.com> (raw)
Currently the return type of load_plugin() in plugin_python.c is void type,
but it is different from the argument type of trace_util_load_plugins().
So fix it for the below warning.
/home/taeung/git/opensource/trace-cmd/plugin_python.c: In function ‘pevent_plugin_loader’:
/home/taeung/git/opensource/trace-cmd/plugin_python.c:95:41: warning: passing argument 3 of ‘trace_util_load_plugins’ from incompatible pointer type [-Wincompatible-pointer-types]
trace_util_load_plugins(pevent, ".py", load_plugin, globals);
^
In file included from /home/taeung/git/opensource/trace-cmd/plugin_python.c:3:0:
/home/taeung/git/opensource/trace-cmd/trace-cmd.h:300:5: note: expected ‘int (*)(struct pevent *, const char *, const char *, void *)’ but argument is of type ‘void (*)(struct pevent *, const char *, const char *, void *)’
int trace_util_load_plugins(struct pevent *pevent, const char *suffix,
^
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
plugin_python.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/plugin_python.c b/plugin_python.c
index da07d27..d736f50 100644
--- a/plugin_python.c
+++ b/plugin_python.c
@@ -20,7 +20,7 @@ static const char pyload[] =
"finally:\n"
" file.close()\n";
-static void load_plugin(struct pevent *pevent, const char *path,
+static int load_plugin(struct pevent *pevent, const char *path,
const char *name, void *data)
{
PyObject *globals = data;
@@ -32,7 +32,7 @@ static void load_plugin(struct pevent *pevent, const char *path,
PyObject *res;
if (!full || !n)
- return;
+ return -ENOMEM;
strcpy(full, path);
strcat(full, "/");
@@ -43,16 +43,18 @@ static void load_plugin(struct pevent *pevent, const char *path,
asprintf(&load, pyload, full, n);
if (!load)
- return;
+ return -1;
res = PyRun_String(load, Py_file_input, globals, globals);
if (!res) {
fprintf(stderr, "failed loading %s\n", full);
PyErr_Print();
+ return -1;
} else
Py_DECREF(res);
free(load);
+ return 0;
}
int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
--
2.7.4
next reply other threads:[~2017-04-24 13:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-24 13:43 Taeung Song [this message]
2017-04-25 23:11 ` Steven Rostedt
2017-04-26 14:56 ` Taeung Song
2017-04-26 17:54 ` Steven Rostedt
2017-04-26 22:51 ` Taeung Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493041411-28428-1-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®