diff options
Diffstat (limited to 'dpi')
| -rw-r--r-- | dpi/datauri.c | 2 | ||||
| -rw-r--r-- | dpi/downloads.cc | 21 | ||||
| -rw-r--r-- | dpi/dpiutil.c | 6 | ||||
| -rw-r--r-- | dpi/dpiutil.h | 2 |
4 files changed, 16 insertions, 15 deletions
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. |