diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-19 14:54:49 +0100 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-19 14:54:49 +0100 |
commit | b7d987a4310ed15d3cdd5e692bee4f66f87c8c26 (patch) | |
tree | 3887feeb7e36ecf829717c1549e9d9a909f83dbf | |
parent | a5baf5a5dbbb633a708d8bf988f5c81b00766eea (diff) | |
parent | 7f757ea0ba9f3ea638c4d9fd144c685dbda9a97d (diff) | |
download | lcd4linux-b7d987a4310ed15d3cdd5e692bee4f66f87c8c26.tar.gz |
Merge 0.11.0~svn1189
Diffstat (limited to '')
-rw-r--r-- | drv_PHAnderson.c | 2 | ||||
-rw-r--r-- | drv_SamsungSPF.c | 2 | ||||
-rw-r--r-- | plugin_button_exec.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drv_PHAnderson.c b/drv_PHAnderson.c index 667d0b0..4cf618b 100644 --- a/drv_PHAnderson.c +++ b/drv_PHAnderson.c @@ -267,7 +267,7 @@ static int drv_PHAnderson_start(const char *section) } s = cfg_get(section, "Bootscreen", NULL); - printf(s); + printf("%s", s); drv_PHAnderson_bootscreen(s); drv_PHAnderson_clear(); /* clear display */ diff --git a/drv_SamsungSPF.c b/drv_SamsungSPF.c index 4e548b3..69f07cf 100644 --- a/drv_SamsungSPF.c +++ b/drv_SamsungSPF.c @@ -388,7 +388,7 @@ int drv_SamsungSPF_list(void) printf("SamsungSPF driver, supported models ["); for (i = 0; i < numFrames; i++) { - printf(spfDevices[i].type); + printf("%s", spfDevices[i].type); if (i < numFrames - 1) printf(", "); } diff --git a/plugin_button_exec.c b/plugin_button_exec.c index 41e5d7e..bf1fec8 100644 --- a/plugin_button_exec.c +++ b/plugin_button_exec.c @@ -1,4 +1,4 @@ -/* $Id: plugin_button_exec.c 1136 2010-11-28 16:07:16Z mzuther $ +/* $Id: plugin_button_exec.c 1189 2012-05-19 12:46:24Z jmccrohan $ * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/plugin_button_exec.c $ * * plugin that forks and exec's once a key is pressed. the difference to the exec plugin is: this can also only be done once! @@ -67,11 +67,11 @@ static void my_button_exec(RESULT * result, int argc, RESULT * argv[]) signal(SIGCHLD, SIG_IGN); prog = R2S(argv[0]); - info(prog); + info("%s", prog); for (i = 1; i < argc; i++) { arg = R2S(argv[i]); args[i] = arg; - info(arg); + info("%s", arg); } args[0] = prog; args[i] = (char *) 0; @@ -82,7 +82,7 @@ static void my_button_exec(RESULT * result, int argc, RESULT * argv[]) execvp(prog, args); errsv = errno; info("executing program failed"); - info(strerror(errsv)); + info("%s", strerror(errsv)); exit(0); } else if (pid == -1) { info("weird error has occurred. couldn't fork."); |