diff lib/rfc959.c @ 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/rfc959.c	Sun Jun 08 22:31:07 2003 +0000
+++ b/lib/rfc959.c	Mon Jun 09 00:53:20 2003 +0000
@@ -1598,7 +1598,8 @@
   gftp_lookup_request_option (request, "proxy_config", &proxy_config);
   if (strcmp (proxy_config, "http") == 0)
     {
-      gftp_protocols[GFTP_HTTP_NUM].init (request);
+      gftp_protocols[GFTP_HTTP_NUM].init (request); /* FIXME - check return value */
+
       gftp_set_request_option (request, "proxy_config", "ftp");
     }
 }
@@ -1631,12 +1632,12 @@
 }
 
 
-void
+int
 rfc959_init (gftp_request * request)
 {
   rfc959_parms * parms;
 
-  g_return_if_fail (request != NULL);
+  g_return_val_if_fail (request != NULL, GFTP_EFATAL);
 
   request->protonum = GFTP_FTP_NUM;
   request->init = rfc959_init;
@@ -1679,5 +1680,7 @@
   parms->data_connection = -1; 
 
   gftp_set_config_options (request);
+
+  return (0);
 }