Mercurial > gftp.yaz
changeset 517:648bf2825ea9
2004-7-27 Brian Masney <masneyb@gftp.org>
* lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/chmod_dialog.c
src/gtk/gtkui.c src/gtk/transfer.c src/uicommon/gftpui.c - removed
unused variables
* src/gtk/misc-gtk.c (progress_timeout) - fixed implicit integer to
float conversion
| author | masneyb |
|---|---|
| date | Tue, 27 Jul 2004 20:43:39 +0000 |
| parents | fbb5a02beddb |
| children | c6a6e908dbaf |
| files | ChangeLog lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/gtkui.c src/gtk/misc-gtk.c src/gtk/transfer.c src/uicommon/gftpui.c |
| diffstat | 9 files changed, 14 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 27 02:46:54 2004 +0000 +++ b/ChangeLog Tue Jul 27 20:43:39 2004 +0000 @@ -1,3 +1,11 @@ +2004-7-27 Brian Masney <masneyb@gftp.org> + * lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/chmod_dialog.c + src/gtk/gtkui.c src/gtk/transfer.c src/uicommon/gftpui.c - removed + unused variables + + * src/gtk/misc-gtk.c (progress_timeout) - fixed implicit integer to + float conversion + 2004-7-26 Brian Masney <masneyb@gftp.org> * lib/config_file.c lib/local.c lib/ftps.c lib/gftp.h lib/httpcommon.h lib/https.c lib/misc.c lib/protocols.c lib/pty.c lib/rfc2068.c @@ -2651,7 +2659,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.294 2004/07/27 02:46:54 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.295 2004/07/27 20:43:39 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/rfc2068.c Tue Jul 27 02:46:54 2004 +0000 +++ b/lib/rfc2068.c Tue Jul 27 20:43:39 2004 +0000 @@ -53,15 +53,12 @@ rfc2068_connect (gftp_request * request) { char *proxy_hostname, *proxy_config; - rfc2068_params * params; intptr_t proxy_port; int ret; g_return_val_if_fail (request != NULL, GFTP_EFATAL); g_return_val_if_fail (request->hostname != NULL, GFTP_EFATAL); - params = request->protocol_data; - if (request->datafd > 0) return (0);
--- a/lib/sshv2.c Tue Jul 27 02:46:54 2004 +0000 +++ b/lib/sshv2.c Tue Jul 27 20:43:39 2004 +0000 @@ -1176,11 +1176,8 @@ gftp_file * fle) { gint32 attrs, hinum, num, count; - sshv2_params *params; int i; - params = request->protocol_data; - if ((attrs = sshv2_buffer_get_int32 (request, message, -1)) < 0) return (attrs); @@ -1488,7 +1485,6 @@ sshv2_chmod (gftp_request * request, const char *file, mode_t mode) { char *tempstr, *endpos, buf[10]; - sshv2_params * params; sshv2_message message; guint32 num; size_t len; @@ -1498,8 +1494,6 @@ g_return_val_if_fail (request->protonum == GFTP_SSHV2_NUM, GFTP_EFATAL); g_return_val_if_fail (file != NULL, GFTP_EFATAL); - params = request->protocol_data; - len = 8; /* For attributes */ tempstr = sshv2_initialize_string_with_path (request, file, &len, &endpos); @@ -1533,7 +1527,6 @@ static int sshv2_mkdir (gftp_request * request, const char *newdir) { - sshv2_params * params; sshv2_message message; char *tempstr; size_t len; @@ -1543,8 +1536,6 @@ g_return_val_if_fail (request->protonum == GFTP_SSHV2_NUM, GFTP_EFATAL); g_return_val_if_fail (newdir != NULL, GFTP_EFATAL); - params = request->protocol_data; - len = 4; /* For attributes */ tempstr = sshv2_initialize_string_with_path (request, newdir, &len, NULL); @@ -1576,7 +1567,6 @@ { char *tempstr, *oldstr, *newstr; size_t oldlen, newlen, len; - sshv2_params * params; sshv2_message message; int ret; @@ -1585,8 +1575,6 @@ g_return_val_if_fail (oldname != NULL, GFTP_EFATAL); g_return_val_if_fail (newname != NULL, GFTP_EFATAL); - params = request->protocol_data; - if (*oldname == '/') oldstr = g_strdup (oldname); else @@ -1632,7 +1620,6 @@ sshv2_set_file_time (gftp_request * request, const char *file, time_t datetime) { char *tempstr, *endpos; - sshv2_params * params; sshv2_message message; guint32 num; size_t len; @@ -1642,8 +1629,6 @@ g_return_val_if_fail (request->protonum == GFTP_SSHV2_NUM, GFTP_EFATAL); g_return_val_if_fail (file != NULL, GFTP_EFATAL); - params = request->protocol_data; - len = 12; /* For date/time */ tempstr = sshv2_initialize_string_with_path (request, file, &len, &endpos);
--- a/src/gtk/bookmarks.c Tue Jul 27 02:46:54 2004 +0000 +++ b/src/gtk/bookmarks.c Tue Jul 27 20:43:39 2004 +0000 @@ -403,7 +403,6 @@ GdkPixmap * closedir_pixmap, * opendir_pixmap; GdkBitmap * closedir_bitmap, * opendir_bitmap; gftp_bookmarks_var * tempentry, * newentry; - GtkCTreeNode * sibling; char *pos, *text[2]; const char *str; #if GTK_MAJOR_VERSION > 1 @@ -436,17 +435,13 @@ newentry->isfolder = 1; if (new_bookmarks->children == NULL) - { - new_bookmarks->children = newentry; - sibling = NULL; - } + new_bookmarks->children = newentry; else { tempentry = new_bookmarks->children; while (tempentry->next != NULL) tempentry = tempentry->next; tempentry->next = newentry; - sibling = tempentry->cnode; } text[0] = text[1] = newentry->path;
--- a/src/gtk/chmod_dialog.c Tue Jul 27 02:46:54 2004 +0000 +++ b/src/gtk/chmod_dialog.c Tue Jul 27 20:43:39 2004 +0000 @@ -59,7 +59,6 @@ dochmod (GtkWidget * widget, gftp_window_data * wdata) { gftpui_callback_data * cdata; - int ret; mode = 0; if (GTK_TOGGLE_BUTTON (suid)->active) @@ -98,7 +97,7 @@ cdata->uidata = wdata; cdata->run_function = do_chmod_thread; - ret = gftpui_common_run_callback_function (cdata); + gftpui_common_run_callback_function (cdata); g_free (cdata); }
--- a/src/gtk/gtkui.c Tue Jul 27 02:46:54 2004 +0000 +++ b/src/gtk/gtkui.c Tue Jul 27 20:43:39 2004 +0000 @@ -263,7 +263,6 @@ { gftpui_callback_data * cdata; const char *edttext; - int ret; cdata = ddata->yespointer; if (ddata->edit != NULL) @@ -279,7 +278,7 @@ cdata->input_string = g_strdup (edttext); } - ret = gftpui_common_run_callback_function (cdata); + gftpui_common_run_callback_function (cdata); }
--- a/src/gtk/misc-gtk.c Tue Jul 27 02:46:54 2004 +0000 +++ b/src/gtk/misc-gtk.c Tue Jul 27 20:43:39 2004 +0000 @@ -1188,7 +1188,7 @@ val = gtk_progress_get_value (GTK_PROGRESS (statuswid)); if (val >= 1.0) - val = 0; + val = 0.0; else val += 0.10; gtk_progress_bar_update (GTK_PROGRESS_BAR (statuswid), val);
--- a/src/gtk/transfer.c Tue Jul 27 02:46:54 2004 +0000 +++ b/src/gtk/transfer.c Tue Jul 27 20:43:39 2004 +0000 @@ -560,7 +560,6 @@ transfer_done (GList * node) { gftpui_common_curtrans_data * transdata; - gftp_request * fromreq; gftp_transfer * tdata; gftp_file * tempfle; GList * templist; @@ -568,8 +567,6 @@ tdata = node->data; if (tdata->started) { - fromreq = tdata->fromwdata != NULL ? ((gftp_window_data *) tdata->fromwdata)->request : NULL; - if (GFTP_IS_SAME_HOST_STOP_TRANS ((gftp_window_data *) tdata->fromwdata, tdata->fromreq)) {
--- a/src/uicommon/gftpui.c Tue Jul 27 02:46:54 2004 +0000 +++ b/src/uicommon/gftpui.c Tue Jul 27 20:43:39 2004 +0000 @@ -1283,8 +1283,8 @@ intptr_t preserve_permissions; struct timeval updatetime; ssize_t num_read, ret; - int i, tofd, fromfd; gftp_file * curfle; + int tofd, fromfd; char buf[8192]; tdata->curfle = tdata->files; @@ -1398,7 +1398,6 @@ memset (&updatetime, 0, sizeof (updatetime)); gftpui_start_current_file_in_transfer (tdata); - i = 0; while (!tdata->cancel && (num_read = gftp_get_next_file_chunk (tdata->fromreq, buf, sizeof (buf))) > 0)