diff lib/rfc2068.c @ 177:aec4b4541d3a

2003-6-9 Brian Masney <[e-mail]> * lib/bookmark.c lib/gftp.h lib/local.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c - make return value of *_set_config_options() be an integer * lib/rfc2068.c lib/rfc959.c - return the error code of gftp_connect_server() if there was a connection problem

--- a/lib/rfc2068.c	Mon Jun 09 23:16:53 2003 +0000
+++ b/lib/rfc2068.c	Tue Jun 10 12:03:54 2003 +0000
@@ -192,7 +192,7 @@
 {
   char *proxy_hostname, *proxy_config;
   rfc2068_params * params;
-  int proxy_port;
+  int proxy_port, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
@@ -213,9 +213,9 @@
       request->url_prefix = g_strdup ("ftp");
     }
 
-  if (gftp_connect_server (request, request->url_prefix, proxy_hostname, 
-                           proxy_port) < 0)
-    return (GFTP_ERETRYABLE);
+  if ((ret = gftp_connect_server (request, request->url_prefix, proxy_hostname, 
+                                  proxy_port)) < 0)
+    return (ret);
 
   if (request->directory && *request->directory == '\0')
     {
@@ -657,9 +657,10 @@
 }
 
 
-static void
+static int
 rfc2068_set_config_options (gftp_request * request)
 {
+  return (0);
 }
 
 
@@ -812,8 +813,6 @@
   params = request->protocol_data;
   params->real_read_function = gftp_fd_read;
 
-  gftp_set_config_options (request);
-
-  return (0);
+  return (gftp_set_config_options (request));
 }