Make Dillo C99 standard compliant

Reviewed-by: dogma

5 files changed, 11 insertions, 11 deletions

diff --git a/dpid/dpid.c b/dpid/dpid.c
index 06ae86b7..93df2e6a 100644
--- a/dpid/dpid.c
+++ b/dpid/dpid.c
@@ -47,7 +47,7 @@ char *SharedKey = NULL;
  * This avoids that dillo instances connect to a stale port after dpid
  * has exited (e.g. after a reboot).
  */
-void cleanup()
+void cleanup(void)
 {
    char *fname;
    fname = dStrconcat(dGethomedir(), "/", dotDILLO_DPID_COMM_KEYS, NULL);
@@ -112,7 +112,7 @@ static void terminator(int sig)
 
 /*! Establish handler for termination signals
  * and register cleanup with atexit */
-void est_dpi_terminator()
+void est_dpi_terminator(void)
 {
    struct sigaction act;
    sigset_t block;
@@ -526,7 +526,7 @@ int fill_services_list(struct dp *attlist, int numdpis, Dlist **services_list)
  * Return a socket file descriptor
  * (useful to set socket options in a uniform way)
  */
-static int make_socket_fd()
+static int make_socket_fd(void)
 {
    int ret, one = 1;
 
@@ -618,7 +618,7 @@ int save_comm_keys(int srs_port)
  * \li Number of sockets (1 == success)
  * \li -1 on failure
  */
-int init_ids_srs_socket()
+int init_ids_srs_socket(void)
 {
    int srs_port, ret = -1;
 
@@ -806,7 +806,7 @@ void ignore_dpi_sockets(struct dp *dpi_attr_list, int numdpis)
  * \Return
  * Number of available dpis
  */
-int register_all_cmd()
+int register_all_cmd(void)
 {
    stop_active_dpis(dpi_attr_list, numdpis);
    free_plugin_list(&dpi_attr_list, numdpis);
diff --git a/dpid/dpid.h b/dpid/dpid.h
index 7186d4ff..b1dc6aab 100644
--- a/dpid/dpid.h
+++ b/dpid/dpid.h
@@ -68,7 +68,7 @@ extern volatile sig_atomic_t caught_sigchld;
 
 void rm_dpi_sockets(struct dp *dpi_attr_list, int numdpis);
 
-void cleanup();
+void cleanup(void);
 
 void free_dpi_attr(struct dp *dpi_attr);
 
@@ -86,7 +86,7 @@ int register_all(struct dp **attlist);
 
 int fill_services_list(struct dp *attlist, int numdpis, Dlist **services_list);
 
-int init_ids_srs_socket();
+int init_ids_srs_socket(void);
 
 int init_dpi_socket(struct dp *dpi_attr);
 
@@ -104,7 +104,7 @@ void stop_active_dpis(struct dp *dpi_attr_list, int numdpis);
 
 void ignore_dpi_sockets(struct dp *dpi_attr_list, int numdpis);
 
-int register_all_cmd();
+int register_all_cmd(void);
 
 char *get_message(int sock, char *dpi_tag);
 
diff --git a/dpid/dpid_common.h b/dpid/dpid_common.h
index 11bd0148..ca67d67f 100644
--- a/dpid/dpid_common.h
+++ b/dpid/dpid_common.h
@@ -10,6 +10,8 @@
  */
 
 #include <dirent.h>
+#include <stddef.h> /* size_t */
+#include <sys/types.h> /* ssize_t */
 
 #include "../dlib/dlib.h"
 
diff --git a/dpid/main.c b/dpid/main.c
index 2c3c3271..b73eb4af 100644
--- a/dpid/main.c
+++ b/dpid/main.c
@@ -48,7 +48,6 @@ struct dp *dpi_attr_list;
 Dlist *services_list;
 int numsocks;
 int srs_fd;
-;
 
 // end of fix
 
diff --git a/dpid/misc_new.c b/dpid/misc_new.c
index 94b4d320..b1355718 100644
--- a/dpid/misc_new.c
+++ b/dpid/misc_new.c
@@ -59,7 +59,7 @@ char *a_Misc_readtag(int sock)
 {
    char *tag, c;
    size_t i;
-   size_t taglen = 0, tagmem = 10;
+   size_t tagmem = 10;
    ssize_t rdln = 1;
 
    tag = NULL;
@@ -71,7 +71,6 @@ char *a_Misc_readtag(int sock)
          tag = (char *) dRealloc(tag, tagmem + 1);
       }
       tag[i] = c;
-      taglen += rdln;
       if (c == '>') {
          tag[i + 1] = '\0';
          break;