diff options
author | rathnor <rathnor> | 2003-06-11 04:21:17 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-06-11 04:21:17 (GMT) |
commit | 0f7c0b9c5fb28db8bb85b52d16a8a7fab77093e9 (patch) | |
tree | 29a4afe7f19ff1f7c637966aae274c92c43b333a | |
parent | 6a14858ac78310369bdd49eb5e050d48c4a418ea (diff) | |
download | fluxbox-0f7c0b9c5fb28db8bb85b52d16a8a7fab77093e9.zip fluxbox-0f7c0b9c5fb28db8bb85b52d16a8a7fab77093e9.tar.bz2 |
make sure that "0" is 4-bit safe for a null pointer by replacing it with (void
*) NULL
-rw-r--r-- | src/FbCommands.cc | 6 | ||||
-rw-r--r-- | src/fluxbox.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/FbCommands.cc b/src/FbCommands.cc index a118fb3..ba409d3 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbCommands.cc,v 1.6 2003/06/08 13:47:30 rathnor Exp $ | 22 | // $Id: FbCommands.cc,v 1.7 2003/06/11 04:21:16 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbCommands.hh" | 24 | #include "FbCommands.hh" |
25 | #include "fluxbox.hh" | 25 | #include "fluxbox.hh" |
@@ -49,11 +49,11 @@ void ExecuteCmd::execute() { | |||
49 | displaystring += intbuff; | 49 | displaystring += intbuff; |
50 | setsid(); | 50 | setsid(); |
51 | putenv(const_cast<char *>(displaystring.c_str())); | 51 | putenv(const_cast<char *>(displaystring.c_str())); |
52 | execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0); | 52 | execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), (void *) NULL); |
53 | exit(0); | 53 | exit(0); |
54 | } | 54 | } |
55 | #else // __EMX__ | 55 | #else // __EMX__ |
56 | spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec().c_str(), 0); | 56 | spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec().c_str(), (void *) NULL); |
57 | #endif // !__EMX__ | 57 | #endif // !__EMX__ |
58 | 58 | ||
59 | } | 59 | } |
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 7c834a6..1d59381 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.cc,v 1.153 2003/06/08 14:32:28 rathnor Exp $ | 25 | // $Id: fluxbox.cc,v 1.154 2003/06/11 04:21:17 rathnor Exp $ |
26 | 26 | ||
27 | #include "fluxbox.hh" | 27 | #include "fluxbox.hh" |
28 | 28 | ||
@@ -1736,7 +1736,7 @@ void Fluxbox::restart(const char *prog) { | |||
1736 | shutdown(); | 1736 | shutdown(); |
1737 | 1737 | ||
1738 | if (prog) { | 1738 | if (prog) { |
1739 | execlp(prog, prog, 0); | 1739 | execlp(prog, prog, (void *) NULL); |
1740 | perror(prog); | 1740 | perror(prog); |
1741 | } | 1741 | } |
1742 | 1742 | ||