httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1174757 - in /httpd/mod_ftp/trunk: include/mod_ftp.h modules/ftp/ftp_internal.h modules/ftp/ftp_protocol.h
Date Fri, 23 Sep 2011 13:42:11 GMT
Author: jim
Date: Fri Sep 23 13:42:11 2011
New Revision: 1174757

URL: http://svn.apache.org/viewvc?rev=1174757&view=rev
Log:
Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change


Modified:
    httpd/mod_ftp/trunk/include/mod_ftp.h
    httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h

Modified: httpd/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/mod_ftp.h?rev=1174757&r1=1174756&r2=1174757&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/mod_ftp.h (original)
+++ httpd/mod_ftp/trunk/include/mod_ftp.h Fri Sep 23 13:42:11 2011
@@ -112,7 +112,7 @@ extern "C" {
 #define FTP_DECLARE_DATA __declspec(dllimport)
 #define FTP_DECLARE(fn)  __declspec(dllimport) fn
 #else
-#define FTP_DECLARE_DATA 
+#define FTP_DECLARE_DATA
 #define FTP_DECLARE(fn)  fn
 #endif
 
@@ -165,7 +165,7 @@ typedef struct ftp_dir_config
 #define ftp_set_module_config(v,val) \
     ap_set_module_config(v, &ftp_module, val)
 
-/* 
+/*
  * FTP connection structure.  Each connection to the server will
  * have an ftp_connection structure associated with it.
  */
@@ -222,13 +222,13 @@ typedef struct ftp_connection
 } ftp_connection;
 
 /*
- * This is the generic registration function, 
+ * This is the generic registration function,
  * see ftp_hook_cmd or ftp_hook_cmd_alias.
  */
 typedef int ftp_hook_fn(request_rec *r, const char *arg);
 
-FTP_DECLARE(void) ftp_hook_cmd_any(const char *key, ftp_hook_fn *pf, 
-                                   const char *alias, int order, 
+FTP_DECLARE(void) ftp_hook_cmd_any(const char *key, ftp_hook_fn *pf,
+                                   const char *alias, int order,
                                    int flags, const char *help);
 
 /* Flags for each FTP command handler.
@@ -240,7 +240,7 @@ FTP_DECLARE(void) ftp_hook_cmd_any(const
  * FTP_DATA_INTR - The current data transfer is interrupted by this command.
  * FTP_NEW_FEAT - This command was introduced following RFC 2389, show in FEAT list.
  *                Also see comments for ftp_feat_advert() below.
- * FTP_NO_HELP - Implicit if the command key contains a space, this flag omits 
+ * FTP_NO_HELP - Implicit if the command key contains a space, this flag omits
  *               a given FTP command from the HELP listing.
  * FTP_EXTENSIBLE - Upon all cmd handlers declining, reply is COMMAND_NOT_IMPL_PARAM
  *                  rather than COMMAND_NOT_IMPLEMENTED
@@ -265,12 +265,12 @@ FTP_DECLARE(void) ftp_hook_cmd_any(const
 
 /*
  * This this the main hook that is used to hook into mod_ftp.  The
- * key is the command, i.e. "DELE".  The ftp_hook_fn is the function 
- * pointer that will handle this request.  The flags variable is an 
+ * key is the command, i.e. "DELE".  The ftp_hook_fn is the function
+ * pointer that will handle this request.  The flags variable is an
  * integer that is used to tell the dispatcher (ftp_run_cmd) properties
- * about the handler that is about to be run.  These flags include 
- * whether the user needs to be logged in, and how many arguments we 
- * expect the command to have. See the flags above for details.  The 
+ * about the handler that is about to be run.  These flags include
+ * whether the user needs to be logged in, and how many arguments we
+ * expect the command to have. See the flags above for details.  The
  * final argument is the help string that will be displayed if the user
  * does "HELP cmd".
  */
@@ -280,13 +280,13 @@ FTP_DECLARE(void) ftp_hook_cmd_any(const
 
 /*
  * This this the alternate hook that is used to hook command aliases
- * into mod_ftp.  The key is the aliased command, i.e. "XPWD".  
+ * into mod_ftp.  The key is the aliased command, i.e. "XPWD".
  * The ftp_hook_fn is used instead to store the base command, i.e. "PWD".
- * The flags variable is an integer that is used to tell the dispatcher 
- * (ftp_run_cmd) properties about the handler that is about to be run.  
+ * The flags variable is an integer that is used to tell the dispatcher
+ * (ftp_run_cmd) properties about the handler that is about to be run.
  * These flags must match the base command hook registration.  This macro
- * will always add FTP_ALIAS_CMD to the flags.  See the flags above for 
- * details of other flags.  The final argument is the help string that will 
+ * will always add FTP_ALIAS_CMD to the flags.  See the flags above for
+ * details of other flags.  The final argument is the help string that will
  * be displayed if the user does "HELP cmd".
  */
 #define ftp_hook_cmd_alias(aliascmd, basecmd, order, flags, desc) \

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h?rev=1174757&r1=1174756&r2=1174757&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h Fri Sep 23 13:42:11 2011
@@ -99,7 +99,7 @@
 #define FTP_NEED_CRLF           (1 << 4)
 #define FTP_NEED_DATA_OUT       (1 << 5)
 /*
- * FTP_MSG_* - Text for sending back to the client.  These include 
+ * FTP_MSG_* - Text for sending back to the client.  These include
  *             metacharacters to enforce rigidity of layout.
  */
 
@@ -128,7 +128,7 @@
 #define FTP_OPT_CHECKMAXCLIENTS (1 << 1) /* Check if the server is full */
 #define FTP_OPT_REMOVEUSERGROUP (1 << 2) /* Fill in user/group information
                                           * on directory listings */
-#define FTP_OPT_NLSTSHOWDIRS    (1 << 3) /* Show directories on NLST 
+#define FTP_OPT_NLSTSHOWDIRS    (1 << 3) /* Show directories on NLST
                                           * requests */
 #define FTP_OPT_NLSTISLIST      (1 << 4) /* Maps NLST directly to LIST */
 #define FTP_OPT_CREATEHOMEDIRS  (1 << 5) /* Create home dirs on the fly */
@@ -167,7 +167,7 @@ typedef struct ftp_direntry
     char datestring[13];        /* Date srings have a fixed length */
     char *username;
     char *groupname;
-    apr_off_t size; 
+    apr_off_t size;
     apr_off_t csize;
     apr_int32_t  nlink;
     struct ftp_direntry *child; /* For descending */
@@ -195,7 +195,7 @@ typedef struct ftp_direntry
 extern ap_filter_rec_t *ftp_input_filter_handle;
 
 /* Routines for handling incoming connections
- * 
+ *
  * ftp_connection.c
  */
 int ftp_process_connection(conn_rec *c);
@@ -204,29 +204,29 @@ int ftp_process_connection(conn_rec *c);
  */
 extern const char ftp_unknown_username[];
 
-/* Routines for handling FTP requests 
+/* Routines for handling FTP requests
  *
- * ftp_request.c 
+ * ftp_request.c
  */
 void ftp_process_request(request_rec *r);
 
-/* Routines specific to the FTP Protocol 
- * 
- * ftp_protocol.c 
+/* Routines specific to the FTP Protocol
+ *
+ * ftp_protocol.c
  */
 request_rec *ftp_read_request(ftp_connection *fc);
 apr_status_t ftp_read_ahead_request(ftp_connection *fc);
-apr_status_t ftp_reply(ftp_connection *fc, ap_filter_t *out_filter, 
+apr_status_t ftp_reply(ftp_connection *fc, ap_filter_t *out_filter,
                        apr_pool_t *p, int n, int l, const char *fmt, ...);
-apr_status_t ftp_show_file(ap_filter_t *out_filter, apr_pool_t *p, int code, 
+apr_status_t ftp_show_file(ap_filter_t *out_filter, apr_pool_t *p, int code,
                            ftp_connection *fc, const char *file);
 void ftp_send_response(request_rec *r, int res);
 apr_status_t ftp_ssl_init(conn_rec *c);
 int ftp_have_ssl(void);
 
 /* Routines specific to the FTP data connections
- * 
- * ftp_data_connection.c 
+ *
+ * ftp_data_connection.c
  */
 void ftp_reset_dataconn(ftp_connection *fc);
 conn_rec *ftp_open_dataconn(request_rec *r, int write_not_read);

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h?rev=1174757&r1=1174756&r2=1174757&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h Fri Sep 23 13:42:11 2011
@@ -5,7 +5,7 @@
  * Do not edit manually; but delete the file and do
  * another gmake (or a make ftp_protocol.h)
  *
- * Generated from ../.. on 
+ * Generated from ../.. on
  * Thu Sep 17 13:02:27 2009
  */
 
@@ -13,7 +13,7 @@
 #define WWW_MIB_TOTAL_FTP_RESPONSES 46
 
 const int ftp_response_types[] = {
-    110, 120, 125, 150, 200, 202, 211, 212, 213, 214, 215, 220, 221, 225, 226, 227, 229,
230, 232, 234, 250, 257, 331, 332, 350, 421, 425, 426, 450, 451, 452, 500, 501, 502, 503,
504, 522, 530, 532, 536, 550, 551, 552, 553, 554, 555, 0 }; 
+    110, 120, 125, 150, 200, 202, 211, 212, 213, 214, 215, 220, 221, 225, 226, 227, 229,
230, 232, 234, 250, 257, 331, 332, 350, 421, 425, 426, 450, 451, 452, 500, 501, 502, 503,
504, 522, 530, 532, 536, 550, 551, 552, 553, 554, 555, 0 };
 
 #define WWW_MIB_TOTAL_FTP_REQUESTS 43
 



Mime
View raw message