httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r646220 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_commands.c ftp_connection.c ftp_data_connection.c ftp_request.c
Date Wed, 09 Apr 2008 08:28:54 GMT
Author: wrowe
Date: Wed Apr  9 01:28:45 2008
New Revision: 646220

URL: http://svn.apache.org/viewvc?rev=646220&view=rev
Log:
Dunno how this happened, but the code style of these assignments
was attrocious.  Reformat.

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_request.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=646220&r1=646219&r2=646220&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Wed Apr  9 01:28:45 2008
@@ -591,8 +591,7 @@
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
     conn_rec *c = r->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     conn_rec *cdata;
     request_rec *rr;
     apr_bucket_brigade *bb;
@@ -891,8 +890,7 @@
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
     conn_rec *c = r->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     conn_rec *cdata;
     request_rec *rr;
     int res;
@@ -1026,8 +1024,7 @@
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
     conn_rec *c = r->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     core_server_config *ftpcore = NULL;
     char *userdir = NULL;
     ftp_dir_config *dconf;
@@ -1097,8 +1094,7 @@
                 core_server_config *core;
 
                 ftpcore = apr_pcalloc(fc->login_pool, sizeof(*ftpcore));
-                core =
-                    ap_get_module_config(r->server->module_config, modp);
+                core = ap_get_module_config(r->server->module_config, modp);
                 *ftpcore = *core;
                 ap_set_module_config(conf_vector, modp, ftpcore);
             }
@@ -1396,8 +1392,7 @@
                                 const char *bindaddr)
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     apr_sockaddr_t *sa;
     apr_socket_t *s;
     apr_status_t rv;
@@ -1509,8 +1504,7 @@
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
     conn_rec *c = r->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     int res;
     apr_sockaddr_t *sa;
     const char *addr;
@@ -1605,8 +1599,7 @@
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
     conn_rec *c = r->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     int res;
     apr_sockaddr_t *sa;
     apr_socket_t *s;
@@ -2088,10 +2081,9 @@
     conn_rec *cdata;
     const char *rfile;
     ap_filter_t *f, *rinput, *routput, *rinput_proto, *routput_proto;
-    ftp_server_config *fsc;
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     int res;
 
-    fsc = ftp_get_module_config(r->server->module_config);
     rfile = arg;
 
     /* Put a note in the env table for logging */
@@ -2752,8 +2744,7 @@
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
     conn_rec *c = r->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     apr_time_t prev_timeout;
     apr_status_t rv;
     char *username;

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=646220&r1=646219&r2=646220&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Wed Apr  9 01:28:45 2008
@@ -116,10 +116,11 @@
 static apr_status_t ftp_send_welcome(ftp_connection *fc)
 {
     conn_rec *c = fc->connection;
-    ftp_server_config *fsc =
-    ftp_get_module_config(fc->orig_server->module_config);
+    ftp_server_config *fsc;
     apr_status_t rv;
 
+    fsc = ftp_get_module_config(fc->orig_server->module_config);
+
     /* Check if a login message has been configured */
     if (fsc->banner_message) {
         if (fsc->banner_message_isfile) {
@@ -169,8 +170,9 @@
     int idle_timeout_set = 0;
     extern ap_filter_rec_t *ftp_ssl_input_filter_handle;
     extern ap_filter_rec_t *ftp_ssl_output_filter_handle;
-    ftp_server_config *fsc =
-    ftp_get_module_config(c->base_server->module_config);
+    ftp_server_config *fsc;
+
+    fsc = ftp_get_module_config(c->base_server->module_config);
 
     if (!fsc->enabled) {
         return DECLINED;

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?rev=646220&r1=646219&r2=646220&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Wed Apr  9 01:28:45 2008
@@ -50,15 +50,14 @@
  */
 static apr_status_t ftp_open_datasock(request_rec *r)
 {
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
-    ftp_server_config *fsc;
+
     apr_interval_time_t timeout;
     apr_pollfd_t pollset[2];
     apr_socket_t *s;
     apr_status_t rv, res;
     int n;
-
-    fsc = ftp_get_module_config(r->server->module_config);
 
     /*
      * handle err condition when the creation of the socket had failed, this

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_request.c?rev=646220&r1=646219&r2=646220&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_request.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_request.c Wed Apr  9 01:28:45 2008
@@ -41,9 +41,7 @@
 void ftp_process_request(request_rec *r)
 {
     ftp_connection *fc = ftp_get_module_config(r->connection->conn_config);
-    ftp_server_config *fsc =
-    ftp_get_module_config(r->server->module_config);
-
+    ftp_server_config *fsc = ftp_get_module_config(r->server->module_config);
     int res;
 
     fc->traffic += r->read_length;



Mime
View raw message