make sure that "0" is 4-bit safe for a null pointer by replacing it with (void
*) NULL
This commit is contained in:
parent
6a14858ac7
commit
0f7c0b9c5f
2 changed files with 5 additions and 5 deletions
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: FbCommands.cc,v 1.6 2003/06/08 13:47:30 rathnor Exp $
|
// $Id: FbCommands.cc,v 1.7 2003/06/11 04:21:16 rathnor Exp $
|
||||||
|
|
||||||
#include "FbCommands.hh"
|
#include "FbCommands.hh"
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
|
@ -49,11 +49,11 @@ void ExecuteCmd::execute() {
|
||||||
displaystring += intbuff;
|
displaystring += intbuff;
|
||||||
setsid();
|
setsid();
|
||||||
putenv(const_cast<char *>(displaystring.c_str()));
|
putenv(const_cast<char *>(displaystring.c_str()));
|
||||||
execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0);
|
execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), (void *) NULL);
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
#else // __EMX__
|
#else // __EMX__
|
||||||
spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec().c_str(), 0);
|
spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec().c_str(), (void *) NULL);
|
||||||
#endif // !__EMX__
|
#endif // !__EMX__
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: fluxbox.cc,v 1.153 2003/06/08 14:32:28 rathnor Exp $
|
// $Id: fluxbox.cc,v 1.154 2003/06/11 04:21:17 rathnor Exp $
|
||||||
|
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
|
|
||||||
|
@ -1736,7 +1736,7 @@ void Fluxbox::restart(const char *prog) {
|
||||||
shutdown();
|
shutdown();
|
||||||
|
|
||||||
if (prog) {
|
if (prog) {
|
||||||
execlp(prog, prog, 0);
|
execlp(prog, prog, (void *) NULL);
|
||||||
perror(prog);
|
perror(prog);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue