changeset 1231:4167a56fc6aa

merge
author Jorge Arellano Cid <jcid@dillo.org>
date Thu, 16 Jul 2009 09:29:00 -0400
parents 20e9bc99f8f6 (current diff) 60fb2b1b6220 (diff)
children d598ecc970c6
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dpid/main.c	Wed Jul 15 22:47:40 2009 +0000
+++ b/dpid/main.c	Thu Jul 16 09:29:00 2009 -0400
@@ -68,7 +68,7 @@
    }
    if (pid == 0) {
       /* Child, start plugin */
-      if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
+      if (execl(dpi_attr.path, dpi_attr.path, (char*)NULL) == -1) {
          ERRMSG("start_plugin", "execl", errno);
          MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
          exit(1);
@@ -100,7 +100,7 @@
       MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
       exit(1);
    }
-   if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
+   if (execl(dpi_attr.path, dpi_attr.path, (char*)NULL) == -1) {
       ERRMSG("start_plugin", "execl", errno);
       MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
       exit(1);
--- a/src/IO/dpi.c	Wed Jul 15 22:47:40 2009 +0000
+++ b/src/IO/dpi.c	Thu Jul 16 09:29:00 2009 -0400
@@ -299,9 +299,9 @@
       /* This is the child process.  Execute the command. */
       char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
       Dpi_close_fd(st_pipe[0]);
-      if (execl(path1, "dpid", NULL) == -1) {
+      if (execl(path1, "dpid", (char*)NULL) == -1) {
          dFree(path1);
-         if (execlp("dpid", "dpid", NULL) == -1) {
+         if (execlp("dpid", "dpid", (char*)NULL) == -1) {
             MSG("Dpi_start_dpid (child): %s\n", dStrerror(errno));
             do
                n = write(st_pipe[1], "ERROR", 5);