- Eliminated gcc 4.2.3 warnings on 64bit OS.

11 files changed, 25 insertions, 23 deletions

diff --git a/dlib/dlib.h b/dlib/dlib.h
index cd3b9fc5..aa32beb4 100644
--- a/dlib/dlib.h
+++ b/dlib/dlib.h
@@ -35,7 +35,7 @@ extern "C" {
 /* TODO: include a void* size test in configure.in */
 /* (long) works for both 32bit and 64bit */
 #define VOIDP2INT(p)    ((long)(p))
-#define INT2VOIDP(i)    ((void*)(i))
+#define INT2VOIDP(i)    ((void*)((long)(i)))
 
 /*
  *-- Memory -------------------------------------------------------------------
diff --git a/dpi/datauri.c b/dpi/datauri.c
index d556f610..1a34482b 100644
--- a/dpi/datauri.c
+++ b/dpi/datauri.c
@@ -296,7 +296,7 @@ int main(void)
    data = datauri_get_data(url, &data_size);
 
    MSG("mime_type: %s\n", mime_type);
-   MSG("data_size: %d\n", data_size);
+   MSG("data_size: %d\n", (int)data_size);
    MSG("data: {%s}\n", data);
 
    if (mime_type && data) {
diff --git a/dpi/downloads.cc b/dpi/downloads.cc
index 9dac719f..d2f3a54b 100644
--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@@ -134,14 +134,14 @@ public:
    void child_init();
    void father_init();
    void update_size(int new_sz);
-   void log_text_add(char *buf, ssize_t st);
+   void log_text_add(const char *buf, ssize_t st);
    void log_text_show();
    void abort_dl();
    void prButton_cb();
    pid_t pid() { return mPid; }
    void pid(pid_t p) { mPid = p; }
    void child_finished(int status);
-   void status_msg(char *msg) { prBar->message(msg); }
+   void status_msg(const char *msg) { prBar->message((char*)msg); }
    Widget *get_widget() { return group; }
    int widget_done() { return WidgetDone; }
    void widget_done(int val) { WidgetDone = val; }
@@ -325,15 +325,15 @@ DLItem::DLItem(const char *full_filename, const char *url, DLAction action)
       Filter_smtp_hack(esc_url);
    dl_argv = new char*[8];
    int i = 0;
-   dl_argv[i++] = "wget";
+   dl_argv[i++] = (char*)"wget";
    if (action == DL_CONTINUE) {
       if (stat(fullname, &ss) == 0)
          init_bytesize = (int)ss.st_size;
-      dl_argv[i++] = "-c";
+      dl_argv[i++] = (char*)"-c";
    }
-   dl_argv[i++] = "--load-cookies";
+   dl_argv[i++] = (char*)"--load-cookies";
    dl_argv[i++] = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL);
-   dl_argv[i++] = "-O";
+   dl_argv[i++] = (char*)"-O";
    dl_argv[i++] = fullname;
    dl_argv[i++] = esc_url;
    dl_argv[i++] = NULL;
@@ -481,9 +481,10 @@ void DLItem::update_prSize(int newsize)
    prSize->redraw_label();
 }
 
-void DLItem::log_text_add(char *buf, ssize_t st)
+void DLItem::log_text_add(const char *buf, ssize_t st)
 {
-   char *p, *q, *d, num[64];
+   const char *p;
+   char *q, *d, num[64];
 
    // Make room...
    if (log_len + st >= log_max) {
@@ -941,8 +942,8 @@ end:
  */
 static void dlwin_esc_cb(Widget *, void *)
 {
-   char *msg = "There are running downloads.\n"
-               "ABORT them and EXIT anyway?";
+   const char *msg = "There are running downloads.\n"
+                     "ABORT them and EXIT anyway?";
 
    if (dl_win && dl_win->num_running() > 0) {
       int ch = fltk::choice(msg, "Yes", "*No", "Cancel");
diff --git a/dpi/dpiutil.c b/dpi/dpiutil.c
index c5dcf45c..b1affe95 100644
--- a/dpi/dpiutil.c
+++ b/dpi/dpiutil.c
@@ -33,10 +33,10 @@
  * Escape URI characters in 'esc_set' as %XX sequences.
  * Return value: New escaped string.
  */
-char *Escape_uri_str(const char *str, char *p_esc_set)
+char *Escape_uri_str(const char *str, const char *p_esc_set)
 {
-   static const char *hex = "0123456789ABCDEF";
-   char *p, *esc_set;
+   static const char *esc_set, *hex = "0123456789ABCDEF";
+   char *p;
    Dstr *dstr;
    int i;
 
diff --git a/dpi/dpiutil.h b/dpi/dpiutil.h
index b8efbb28..fa3dfb86 100644
--- a/dpi/dpiutil.h
+++ b/dpi/dpiutil.h
@@ -69,7 +69,7 @@ void sock_handler_free(SockHandler *sh);
  * Escape URI characters in 'esc_set' as %XX sequences.
  * Return value: New escaped string.
  */
-char *Escape_uri_str(const char *str, char *p_esc_set);
+char *Escape_uri_str(const char *str, const char *p_esc_set);
 
 /*
  * Escape unsafe characters as html entities.
diff --git a/dpip/dpip.c b/dpip/dpip.c
index ccd11333..c6212db9 100644
--- a/dpip/dpip.c
+++ b/dpip/dpip.c
@@ -111,7 +111,7 @@ char *a_Dpip_build_cmd(const char *format, ...)
  *       (stuffing of ' is removed here)
  * Return value: the attribute value, or NULL if not present or malformed.
  */
-char *a_Dpip_get_attr(char *tag, size_t tagsize, char *attrname)
+char *a_Dpip_get_attr(char *tag, size_t tagsize, const char *attrname)
 {
    uint_t i, n = 0, found = 0;
    char *p, *q, *start, *val = NULL;
diff --git a/dpip/dpip.h b/dpip/dpip.h
index 8a8623bc..29bb5fcf 100644
--- a/dpip/dpip.h
+++ b/dpip/dpip.h
@@ -23,7 +23,7 @@ char *a_Dpip_build_cmd(const char *format, ...);
  *       (dpip character escaping is removed here)
  * Return value: the attribute value, or NULL if not present or malformed.
  */
-char *a_Dpip_get_attr(char *tag, size_t tagsize, char *attrname);
+char *a_Dpip_get_attr(char *tag, size_t tagsize, const char *attrname);
 
 
 #ifdef __cplusplus
diff --git a/src/IO/IO.c b/src/IO/IO.c
index db3239a6..8dd3a1ae 100644
--- a/src/IO/IO.c
+++ b/src/IO/IO.c
@@ -330,11 +330,11 @@ static void IO_submit(IOData_t *r_io)
 
    if (r_io->Op == IORead) {
       a_IOwatch_add_fd(r_io->FD, DIO_READ,
-                       IO_fd_read_cb, (void*)(r_io->Key));
+                       IO_fd_read_cb, INT2VOIDP(r_io->Key));
 
    } else if (r_io->Op == IOWrite) {
       a_IOwatch_add_fd(r_io->FD, DIO_WRITE,
-                       IO_fd_write_cb, (void*)(r_io->Key));
+                       IO_fd_write_cb, INT2VOIDP(r_io->Key));
    }
 }
 
diff --git a/src/dns.c b/src/dns.c
index b47658c0..73ada0ad 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -336,7 +336,8 @@ static void Dns_server_req(int channel, const char *hostname)
    dns_server[channel].hostname = dStrdup(hostname);
 
    /* Let's set a timeout client to poll the server channel (5 times/sec) */
-   a_Timeout_add(0.2,Dns_timeout_client,(void*)(dns_server[channel].channel));
+   a_Timeout_add(0.2,Dns_timeout_client,
+                 INT2VOIDP(dns_server[channel].channel));
 
 #ifdef D_DNS_THREADED
    /* set the thread attribute to the detached state */
diff --git a/src/misc.c b/src/misc.c
index 75c61f48..7cb0b9ff 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -24,7 +24,7 @@
  * Escape characters as %XX sequences.
  * Return value: New string.
  */
-char *a_Misc_escape_chars(const char *str, char *esc_set)
+char *a_Misc_escape_chars(const char *str, const char *esc_set)
 {
    static const char *hex = "0123456789ABCDEF";
    char *p = NULL;
diff --git a/src/misc.h b/src/misc.h
index c4d901ab..2659875b 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -9,7 +9,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-char *a_Misc_escape_chars(const char *str, char *esc_set);
+char *a_Misc_escape_chars(const char *str, const char *esc_set);
 char *a_Misc_expand_tabs(const char *str);
 int a_Misc_get_content_type_from_data(void *Data, size_t Size,const char **PT);
 int a_Misc_content_type_check(const char *EntryType, const char *DetectedType);