changeset 521:739afd9df73c

2004-7-27 Brian Masney <masneyb@gftp.org> * lib/rfc959.c src/gtk/misc-gtk.c src/gtk/view_dialog.c - fixed more comparsions between signed and unsigned integers * lib/sshv2.c (sshv2_buffer_get_int32) - allow an expected response value of 0. If it does not match, call sshv2_wrong_response(). SSH_FX_OK is set to 0, so this value was not being checked * src/gtk/gtkui.c src/text/textui.c src/uicommon/gftpui.h - renamed the clear_cache argument of gftpui_refresh() to clear_cache_entry. There is already a function named clear_cache()
author masneyb
date Wed, 28 Jul 2004 02:47:25 +0000
parents e67a52327b24
children 1e1b4038d146
files ChangeLog lib/rfc959.c lib/sshv2.c src/gtk/gtkui.c src/gtk/misc-gtk.c src/gtk/view_dialog.c src/text/textui.c src/uicommon/gftpui.h
diffstat 8 files changed, 22 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jul 28 02:19:00 2004 +0000
+++ b/ChangeLog	Wed Jul 28 02:47:25 2004 +0000
@@ -1,4 +1,15 @@
 2004-7-27 Brian Masney <masneyb@gftp.org>
+	* lib/rfc959.c src/gtk/misc-gtk.c src/gtk/view_dialog.c - fixed more
+	comparsions between signed and unsigned integers
+
+	* lib/sshv2.c (sshv2_buffer_get_int32) - allow an expected response
+	value of 0. If it does not match, call sshv2_wrong_response().
+	SSH_FX_OK is set to 0, so this value was not being checked
+
+	* src/gtk/gtkui.c src/text/textui.c src/uicommon/gftpui.h - renamed the
+	clear_cache argument of gftpui_refresh() to clear_cache_entry. There is
+	already a function named clear_cache()
+
 	* lib/gftp.h lib/local.c lib/protocols.c lib/sshv2.c - changed
 	declaration of gftp_stat_filename() so that the mode of the filename
 	is returned as a parameter instead of the function return value.
@@ -2680,7 +2691,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.298 2004/07/28 02:19:00 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.299 2004/07/28 02:47:24 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/lib/rfc959.c	Wed Jul 28 02:19:00 2004 +0000
+++ b/lib/rfc959.c	Wed Jul 28 02:47:25 2004 +0000
@@ -1405,10 +1405,9 @@
 rfc959_put_next_file_chunk (gftp_request * request, char *buf, size_t size)
 {
   rfc959_parms * parms;
+  size_t rsize, i, j;
   ssize_t num_wrote;
   char *tempstr;
-  size_t rsize;
-  int i, j;
 
   if (size == 0)
     return (0);
--- a/lib/sshv2.c	Wed Jul 28 02:19:00 2004 +0000
+++ b/lib/sshv2.c	Wed Jul 28 02:47:25 2004 +0000
@@ -844,7 +844,7 @@
   ret = ntohl (ret);
   message->pos += 4;
 
-  if (expected_response > 0 && ret != expected_response)
+  if (expected_response >= 0 && ret != expected_response)
     return (sshv2_wrong_response (request, message));
 
   return (ret);
--- a/src/gtk/gtkui.c	Wed Jul 28 02:19:00 2004 +0000
+++ b/src/gtk/gtkui.c	Wed Jul 28 02:47:25 2004 +0000
@@ -43,7 +43,7 @@
 
 
 void
-gftpui_refresh (void *uidata, int clear_cache)
+gftpui_refresh (void *uidata, int clear_cache_entry)
 {
   gftp_window_data * wdata;
 
@@ -57,7 +57,7 @@
   gtk_clist_freeze (GTK_CLIST (wdata->listbox));
   remove_files_window (wdata);
 
-  if (clear_cache)
+  if (clear_cache_entry)
     gftp_delete_cache_entry (wdata->request, NULL, 0);
 
   ftp_list_files (wdata);
--- a/src/gtk/misc-gtk.c	Wed Jul 28 02:19:00 2004 +0000
+++ b/src/gtk/misc-gtk.c	Wed Jul 28 02:47:25 2004 +0000
@@ -565,7 +565,7 @@
 {
   const char *strip_prefix;
   size_t strip_prefix_len;
-  int i;
+  size_t i;
 
   strip_prefix = gtk_object_get_data (GTK_OBJECT (ifactory), "gftp-strip-prefix");
   if (strip_prefix)
--- a/src/gtk/view_dialog.c	Wed Jul 28 02:19:00 2004 +0000
+++ b/src/gtk/view_dialog.c	Wed Jul 28 02:47:25 2004 +0000
@@ -248,8 +248,9 @@
   gftp_file_extensions * tempext;
   gftp_viewedit_data * newproc;
   GtkAdjustment * vadj;
-  int stlen, doclose;
   GList * templist;
+  size_t stlen;
+  int doclose;
   ssize_t n;
 #if GTK_MAJOR_VERSION > 1
   GtkTextBuffer * textbuf;
--- a/src/text/textui.c	Wed Jul 28 02:19:00 2004 +0000
+++ b/src/text/textui.c	Wed Jul 28 02:47:25 2004 +0000
@@ -40,13 +40,13 @@
 
 
 void
-gftpui_refresh (void *uidata, int clear_cache)
+gftpui_refresh (void *uidata, int clear_cache_entry)
 {
   gftp_request * request;
 
   request = uidata; /* Note: uidata is set to the request in gftp_text.c */
 
-  if (clear_cache)
+  if (clear_cache_entry)
     gftp_delete_cache_entry (request, NULL, 0);
 }
 
--- a/src/uicommon/gftpui.h	Wed Jul 28 02:19:00 2004 +0000
+++ b/src/uicommon/gftpui.h	Wed Jul 28 02:47:25 2004 +0000
@@ -161,7 +161,7 @@
 int gftpui_check_reconnect		( gftpui_callback_data * cdata );
 
 void gftpui_refresh 			( void *uidata,
-					  int clear_cache );
+					  int clear_cache_entry );
 
 void *gftpui_generic_thread 		( void *(*run_function)(void *data),
 					  void *data);