diff lib/gftp.h @ 173:4c288d05b26a

2003-6-8 Brian Masney <[e-mail]> * lib/bookmark.c lib/gftp.h lib/https.c lib/local.c lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c src/text/gftp-text.c src/gtk/gftp-gtk.c - made the init function for all the protocols return an integer instead of nothing. If there was an error setting up the protocol, GFTP_EFATAL should be returned and the connection should be aborted. The HTTPS protocol uses this to return if SSL support was not compiled in * lib/protocols.c src/text/gftp-text.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/menu-items.c - have gftp_parse_url() log the error messages to the user. This shouldn't have been done in the individual ports * lib/https.c - only initialize the SSL engine the first time a SSL connection is made.

--- a/lib/gftp.h	Sun Jun 08 22:31:07 2003 +0000
+++ b/lib/gftp.h	Mon Jun 09 00:53:20 2003 +0000
@@ -340,7 +340,7 @@
   gftp_logging_func logging_function;
   void *user_data;
 
-  void (*init)				( gftp_request * request );
+  int (*init)				( gftp_request * request );
   ssize_t (*read_function)		( gftp_request * request,
 					  void *ptr, 
 					  size_t size, 
@@ -474,7 +474,7 @@
 typedef struct supported_gftp_protocols_tag 
 {
   char *name;					/* Description of protocol */
-  void (*init) (gftp_request * request);	/* Init function */
+  int (*init) (gftp_request * request);		/* Init function */
   void (*register_options) (void);		/* Protocol options */
   char *url_prefix;				/* URL Prefix */
   int shown;					/* Whether this protocol is 
@@ -669,7 +669,7 @@
                                                   (request)->always_connected))
 
 
-void rfc959_init 			( gftp_request * request );
+int rfc959_init 			( gftp_request * request );
 
 void rfc959_register_module		( void );
 
@@ -677,23 +677,23 @@
 					  gftp_file *fle, 
 					  int fd );
 
-void rfc2068_init 			( gftp_request * request );
+int rfc2068_init 			( gftp_request * request );
 
 void rfc2068_register_module		( void );
 
-void https_init 			( gftp_request * request );
+int https_init 				( gftp_request * request );
 
 void https_register_module		( void );
 
-void local_init 			( gftp_request * request );
+int local_init 				( gftp_request * request );
 
 void local_register_module		( void );
 
-void sshv2_init 			( gftp_request * request );
+int sshv2_init 				( gftp_request * request );
 
 void sshv2_register_module		( void );
 
-void bookmark_init 			( gftp_request * request );
+int bookmark_init 			( gftp_request * request );
 
 void bookmark_register_module		( void );