Mercurial > gftp.yaz
changeset 767:49cfbe02926b
2006-7-13 Brian Masney <masneyb@gftp.org>
* src/gtk/bookmarks.c src/gtk/delete_dialog.c src/gtk/dnd.c
src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c
src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/options_dialog.c
src/gtk/transfer.c src/gtk/view_dialog.c - fixed a few minor warnings
from splint.
| author | masneyb |
|---|---|
| date | Fri, 14 Jul 2006 01:53:42 +0000 |
| parents | 1ad4eb5c29de |
| children | 8ed30ec92aae |
| files | ChangeLog src/gtk/bookmarks.c src/gtk/delete_dialog.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/options_dialog.c src/gtk/transfer.c src/gtk/view_dialog.c |
| diffstat | 12 files changed, 83 insertions(+), 79 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 14 00:37:27 2006 +0000 +++ b/ChangeLog Fri Jul 14 01:53:42 2006 +0000 @@ -1,4 +1,10 @@ 2006-7-13 Brian Masney <masneyb@gftp.org> + * src/gtk/bookmarks.c src/gtk/delete_dialog.c src/gtk/dnd.c + src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/gtkui.c + src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/options_dialog.c + src/gtk/transfer.c src/gtk/view_dialog.c - fixed a few minor warnings + from splint. + * src/text/textui.c src/uicommon/gftpui.c - fixed a few minor warnings from splint. @@ -3409,7 +3415,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.439 2006/07/14 00:37:26 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.440 2006/07/14 01:53:41 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/bookmarks.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/bookmarks.c Fri Jul 14 01:53:42 2006 +0000 @@ -52,7 +52,7 @@ if (refresh_local) gftpui_refresh (other_wdata, 0); - ftp_connect (current_wdata, current_wdata->request, 1); + ftp_connect (current_wdata, current_wdata->request); } @@ -81,7 +81,7 @@ tempentry = g_malloc0 (sizeof (*tempentry)); - dpos = tempentry->path = g_malloc (strlen (edttxt) + 1); + dpos = tempentry->path = g_malloc ((gulong) strlen (edttxt) + 1); for (spos = edttxt; *spos != '\0';) { *dpos++ = *spos++; @@ -740,7 +740,7 @@ g_free (entry->acct); entry->acct = g_strdup (str); - gftp_gtk_save_bookmark_options (entry); + gftp_gtk_save_bookmark_options (); if (strcmp (entry->path, newpath) != 0) { @@ -827,7 +827,7 @@ { GtkWidget * table, * tempwid, * menu, * notebook; gftp_bookmarks_var * entry; - int i, num; + unsigned int num, i; char *pos; if (bm_dialog != NULL)
--- a/src/gtk/delete_dialog.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/delete_dialog.c Fri Jul 14 01:53:42 2006 +0000 @@ -117,7 +117,7 @@ gftp_swap_socks (transfer->fromreq, wdata->request); - ret = gftp_gtk_get_subdirs (transfer, &wdata->tid); + ret = gftp_gtk_get_subdirs (transfer); gftp_swap_socks (wdata->request, transfer->fromreq);
--- a/src/gtk/dnd.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/dnd.c Fri Jul 14 01:53:42 2006 +0000 @@ -135,7 +135,7 @@ ftp_log (gftp_logging_misc, NULL, _("Received URL %s\n"), (char *) selection_data->data); - ftp_connect (current_wdata, current_wdata->request, 1); + ftp_connect (current_wdata, current_wdata->request); } } } @@ -216,7 +216,7 @@ } else { - str = g_malloc (totlen + 1); + str = g_malloc ((gulong) totlen + 1); strcpy (str, tempstr); } g_free (tempstr); @@ -262,7 +262,7 @@ if (len == 0) break; - tempstr = g_malloc (len + 1); + tempstr = g_malloc ((gulong) len + 1); memcpy (tempstr, oldpos, len); tempstr[len] = '\0';
--- a/src/gtk/gftp-gtk.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/gftp-gtk.c Fri Jul 14 01:53:42 2006 +0000 @@ -1041,7 +1041,7 @@ if (argc == 2 && strncmp (argv[1], "--", 2) != 0) { if (gftp_parse_url (window2.request, argv[1]) == 0) - ftp_connect (&window2, window2.request, 1); + ftp_connect (&window2, window2.request); else gftp_usage (); } @@ -1103,7 +1103,7 @@ gftp_parse_url (current_wdata->request, current_wdata->request->hostname) == 0) { - ftp_connect (current_wdata, current_wdata->request, 1); + ftp_connect (current_wdata, current_wdata->request); return; } @@ -1132,7 +1132,7 @@ add_history (current_wdata->combo, current_wdata->history, current_wdata->histlen, current_wdata->request->directory); - ftp_connect (current_wdata, current_wdata->request, 1); + ftp_connect (current_wdata, current_wdata->request); }
--- a/src/gtk/gftp-gtk.h Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/gftp-gtk.h Fri Jul 14 01:53:42 2006 +0000 @@ -169,8 +169,8 @@ * notebook, * box, * table; - int tbl_col_num, - tbl_row_num; + unsigned int tbl_col_num, + tbl_row_num; gftp_option_type_enum last_option; gftp_bookmarks_var * bm; } gftp_options_dialog_data; @@ -330,10 +330,10 @@ int check_status ( char *name, gftp_window_data * wdata, - int check_other_stop, - int only_one, - int at_least_one, - int func ); + unsigned int check_other_stop, + unsigned int only_one, + unsigned int at_least_one, + unsigned int func ); GtkItemFactory *item_factory_new ( GtkType container_type, const char *path, @@ -341,7 +341,7 @@ const char *strip_prefix ); void create_item_factory ( GtkItemFactory * ifactory, - guint n_entries, + gint n_entries, GtkItemFactoryEntry * entries, gpointer callback_data ); @@ -390,14 +390,13 @@ void gftp_gtk_setup_bookmark_options ( GtkWidget * notebook, gftp_bookmarks_var * bm ); -void gftp_gtk_save_bookmark_options ( gftp_bookmarks_var * bm ); +void gftp_gtk_save_bookmark_options ( void ); /* transfer.c */ int ftp_list_files ( gftp_window_data * wdata ); int ftp_connect ( gftp_window_data * wdata, - gftp_request * request, - int getdir ); + gftp_request * request ); gint update_downloads ( gpointer data ); @@ -408,8 +407,7 @@ void transfer_window_files ( gftp_window_data * fromwdata, gftp_window_data * towdata ); -int gftp_gtk_get_subdirs ( gftp_transfer * transfer, - pthread_t *tid ); +int gftp_gtk_get_subdirs ( gftp_transfer * transfer ); void *do_getdir_thread ( void * data ); @@ -432,10 +430,10 @@ void view_file ( char *filename, int fd, - int viewedit, - int del_file, - int start_pos, - int dontupload, + unsigned int viewedit, + unsigned int del_file, + unsigned int start_pos, + unsigned int dontupload, char *remote_filename, gftp_window_data * wdata );
--- a/src/gtk/gtkui.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/gtkui.c Fri Jul 14 01:53:42 2006 +0000 @@ -253,7 +253,7 @@ wdata = cdata->uidata; return (wdata->request->cached && wdata->request->datafd < 0 && !wdata->request->always_connected && - !ftp_connect (wdata, wdata->request, 0) ? -1 : 0); + !ftp_connect (wdata, wdata->request) ? -1 : 0); }
--- a/src/gtk/menu-items.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/menu-items.c Fri Jul 14 01:53:42 2006 +0000 @@ -276,7 +276,8 @@ void clearlog (gpointer data) { - guint len; + gint len; + #if GTK_MAJOR_VERSION == 1 len = gtk_text_get_length (GTK_TEXT (logwdw)); gtk_text_set_point (GTK_TEXT (logwdw), len); @@ -298,7 +299,7 @@ viewlog (gpointer data) { char *tempstr, *txt, *pos; - guint textlen; + gint textlen; ssize_t len; int fd; #if GTK_MAJOR_VERSION > 1 @@ -361,7 +362,7 @@ { const char *filename; char *txt, *pos; - guint textlen; + gint textlen; ssize_t len; FILE *fd; int ok; @@ -457,7 +458,7 @@ #if GTK_MAJOR_VERSION > 1 GtkTextBuffer * textbuf; GtkTextIter iter; - guint textlen; + gint textlen; #endif share_dir = gftp_get_share_dir (); @@ -505,7 +506,8 @@ str = _("Translated by"); if (strcmp (str, "Translated by") != 0) { - tempstr = g_realloc (tempstr, strlen (tempstr) + strlen (str) + 1); + tempstr = g_realloc (tempstr, + (gulong) (strlen (tempstr) + strlen (str) + 1)); strcat (tempstr, str); } tempwid = gtk_label_new (tempstr);
--- a/src/gtk/misc-gtk.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/misc-gtk.c Fri Jul 14 01:53:42 2006 +0000 @@ -209,9 +209,8 @@ update_window_info (void) { char *tempstr, empty[] = ""; + unsigned int port, i; GtkWidget * tempwid; - unsigned int port; - int i; if (current_wdata->request != NULL) { @@ -499,8 +498,9 @@ int -check_status (char *name, gftp_window_data *wdata, int check_other_stop, - int only_one, int at_least_one, int func) +check_status (char *name, gftp_window_data *wdata, + unsigned int check_other_stop, unsigned int only_one, + unsigned int at_least_one, unsigned int func) { gftp_window_data * owdata; @@ -594,12 +594,12 @@ void -create_item_factory (GtkItemFactory * ifactory, guint n_entries, - GtkItemFactoryEntry * entries, gpointer callback_data) +create_item_factory (GtkItemFactory * ifactory, gint n_entries, + GtkItemFactoryEntry * entries, gpointer callback_data) { const char *strip_prefix; size_t strip_prefix_len; - size_t i; + int i; strip_prefix = gtk_object_get_data (GTK_OBJECT (ifactory), "gftp-strip-prefix"); if (strip_prefix) @@ -676,7 +676,7 @@ { return (wdata->request->cached && wdata->request->datafd < 0 && !wdata->request->always_connected && - !ftp_connect (wdata, wdata->request, 0) ? -1 : 0); + !ftp_connect (wdata, wdata->request) ? -1 : 0); } @@ -1285,7 +1285,7 @@ printf (_("gFTP Error: Cannot find file %s in %s or %s\n"), filename, share_dir, BASE_CONF_DIR); - exit (1); + exit (EXIT_FAILURE); } } }
--- a/src/gtk/options_dialog.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/options_dialog.c Fri Jul 14 01:53:42 2006 +0000 @@ -83,7 +83,7 @@ static void * -_print_option_type_newtable (gftp_config_vars * cv, void *user_data, void *value) +_print_option_type_newtable (void *user_data) { gftp_options_dialog_data * option_data; @@ -232,7 +232,7 @@ #if GTK_MAJOR_VERSION > 1 GtkTextIter iter, iter2; GtkTextBuffer * textbuf; - guint len; + gint len; #endif widdata = data; @@ -289,7 +289,7 @@ *endpos = '\0'; len += strlen (stpos) + 1; - ret = g_realloc (ret, len + 1); + ret = g_realloc (ret, (gulong) len + 1); strcat (ret, stpos); strcat (ret, "\n"); @@ -299,7 +299,7 @@ if (stpos != NULL && *stpos != '\0') { len += strlen (stpos); - ret = g_realloc (ret, len + 1); + ret = g_realloc (ret, (gulong) len + 1); strcat (ret, stpos); } @@ -324,7 +324,7 @@ *endpos = '\0'; len += strlen (stpos) + 2; - ret = g_realloc (ret, len + 1); + ret = g_realloc (ret, (gulong) len + 1); strcat (ret, stpos); strcat (ret, "%n"); @@ -334,7 +334,7 @@ if (stpos != NULL && *stpos != '\0') { len += strlen (stpos); - ret = g_realloc (ret, len + 1); + ret = g_realloc (ret, (gulong) len + 1); strcat (ret, stpos); } @@ -572,7 +572,7 @@ option_data = user_data; if (option_data->last_option != gftp_option_type_checkbox) - _print_option_type_newtable (NULL, user_data, NULL); + _print_option_type_newtable (user_data); if (option_data->tbl_col_num == 0) { @@ -674,7 +674,7 @@ gtk_notebook_append_page (GTK_NOTEBOOK (option_data->notebook), option_data->box, tempwid); - _print_option_type_newtable (NULL, user_data, NULL); + _print_option_type_newtable (user_data); return (NULL); } @@ -1520,7 +1520,7 @@ void -gftp_gtk_save_bookmark_options (gftp_bookmarks_var * bm) +gftp_gtk_save_bookmark_options () { gftp_config_vars * cv; GList * templist;
--- a/src/gtk/transfer.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/transfer.c Fri Jul 14 01:53:42 2006 +0000 @@ -57,7 +57,7 @@ int -ftp_connect (gftp_window_data * wdata, gftp_request * request, int getdir) +ftp_connect (gftp_window_data * wdata, gftp_request * request) { if (wdata->request == request) gtk_label_set (GTK_LABEL (wdata->hoststxt), _("Connecting...")); @@ -128,7 +128,7 @@ gftp_swap_socks (transfer->fromreq, fromwdata->request); gftp_swap_socks (transfer->toreq, towdata->request); - ret = gftp_gtk_get_subdirs (transfer, &fromwdata->tid); + ret = gftp_gtk_get_subdirs (transfer); if (ret < 0) disconnect = 1; else @@ -219,7 +219,7 @@ int -gftp_gtk_get_subdirs (gftp_transfer * transfer, pthread_t *tid) +gftp_gtk_get_subdirs (gftp_transfer * transfer) { gftpui_callback_data * cdata; long numfiles, numdirs; @@ -688,12 +688,12 @@ _setup_dlstr (gftp_transfer * tdata, gftp_file * fle, char *dlstr, size_t dlstr_len) { - int hours, mins, secs, pcent, st, usesentdescr; + int hours, mins, secs, stalled, usesentdescr; unsigned long remaining_secs, lkbs; char gotstr[50], ofstr[50]; struct timeval tv; - st = 1; + stalled = 1; gettimeofday (&tv, NULL); usesentdescr = (tdata->fromreq->protonum == GFTP_LOCAL_NUM); @@ -702,23 +702,21 @@ if (tv.tv_sec - tdata->lasttime.tv_sec <= 5) { - if (tdata->curfle->next != NULL) - { - remaining_secs = (fle->size - tdata->curtrans - tdata->curresumed) / 1024; + remaining_secs = (fle->size - tdata->curtrans - tdata->curresumed) / 1024; + + lkbs = (unsigned long) tdata->kbs; + if (lkbs > 0) + remaining_secs /= lkbs; - lkbs = (unsigned long) tdata->kbs; - if (lkbs > 0) - remaining_secs /= lkbs; - - hours = remaining_secs / 3600; - remaining_secs -= hours * 3600; - mins = remaining_secs / 60; - remaining_secs -= mins * 60; - secs = remaining_secs; - } + hours = remaining_secs / 3600; + remaining_secs -= hours * 3600; + mins = remaining_secs / 60; + remaining_secs -= mins * 60; + secs = remaining_secs; if (!(hours < 0 || mins < 0 || secs < 0)) { + stalled = 0; if (usesentdescr) { g_snprintf (dlstr, dlstr_len, @@ -729,11 +727,10 @@ g_snprintf (dlstr, dlstr_len, _("Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"), gotstr, ofstr, tdata->kbs, hours, mins, secs); } - st = 0; } } - if (st) + if (stalled) { tdata->stalled = 1; if (usesentdescr) @@ -757,8 +754,8 @@ { char totstr[150], winstr[150], dlstr[150]; unsigned long remaining_secs, lkbs; + int hours, mins, secs, pcent; intptr_t show_trans_in_title; - int hours, mins, secs, pcent; gftp_file * tempfle; g_static_mutex_lock (&tdata->statmutex);
--- a/src/gtk/view_dialog.c Fri Jul 14 00:37:27 2006 +0000 +++ b/src/gtk/view_dialog.c Fri Jul 14 01:53:42 2006 +0000 @@ -171,8 +171,8 @@ static gftp_viewedit_data * fork_process (char *proc, char *filename, int fd, char *remote_filename, - int viewedit, int del_file, int dontupload, - gftp_window_data * wdata) + unsigned int viewedit, unsigned int del_file, + unsigned int dontupload, gftp_window_data * wdata) { gftp_viewedit_data * newproc; char *pos, *endpos, **argv; @@ -186,12 +186,12 @@ { *endpos = '\0'; n++; - argv = g_realloc (argv, n * sizeof (char *)); + argv = g_realloc (argv, (gulong) n * sizeof (char *)); argv[n - 1] = g_strdup (pos); *endpos = ' '; pos = endpos + 1; } - argv = g_realloc (argv, (n + 3) * sizeof (char *)); + argv = g_realloc (argv, (gulong) (n + 3) * sizeof (char *)); argv[n] = g_strdup (pos); argv[n + 1] = g_strdup (filename); argv[n + 2] = NULL; @@ -239,8 +239,9 @@ void -view_file (char *filename, int fd, int viewedit, int del_file, int start_pos, - int dontupload, char *remote_filename, gftp_window_data * wdata) +view_file (char *filename, int fd, unsigned int viewedit, unsigned int del_file, + unsigned int start_pos, unsigned int dontupload, + char *remote_filename, gftp_window_data * wdata) { GtkWidget * dialog, * view, * table, * tempwid; char buf[8192], *view_program, *edit_program;