httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From soc-r...@apache.org
Subject svn commit: r239473 - in /httpd/mod_smtpd/trunk: smtp_core.c smtp_protocol.c
Date Tue, 23 Aug 2005 22:39:31 GMT
Author: soc-rian
Date: Tue Aug 23 15:39:28 2005
New Revision: 239473

URL: http://svn.apache.org/viewcvs?rev=239473&view=rev
Log:
more style conformity

Modified:
    httpd/mod_smtpd/trunk/smtp_core.c
    httpd/mod_smtpd/trunk/smtp_protocol.c

Modified: httpd/mod_smtpd/trunk/smtp_core.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp_core.c?rev=239473&r1=239472&r2=239473&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp_core.c (original)
+++ httpd/mod_smtpd/trunk/smtp_core.c Tue Aug 23 15:39:28 2005
@@ -223,13 +223,13 @@
     int i;
     
     for (i = 0; i < msgs->nelts - 1; i++) {
-        ap_fprintf(scr->c->output_filters, scr->bb_out, "%d-%s\r\n",
-                   code, ((char **)msgs->elts)[i]);
+        ap_fprintf(scr->c->output_filters, scr->bb_out, "%d-%s\r\n", code,
+                   ((char **)msgs->elts)[i]);
         ap_fflush(scr->c->output_filters, scr->bb_out);
     }
     
-    ap_fprintf(scr->c->output_filters, scr->bb_out, "%d %s\r\n",
-               code, ((char **)msgs->elts)[i]);
+    ap_fprintf(scr->c->output_filters, scr->bb_out, "%d %s\r\n", code,
+               ((char **)msgs->elts)[i]);
     ap_fflush(scr->c->output_filters, scr->bb_out);
     
     return APR_SUCCESS;
@@ -238,8 +238,8 @@
 apr_status_t smtpd_respond_oneline(smtpd_conn_rec *scr, int code,
                                    char *message)
 {
-    ap_fprintf(scr->c->output_filters, scr->bb_out,
-               "%d %s\r\n", code, message);
+    ap_fprintf(scr->c->output_filters, scr->bb_out, "%d %s\r\n", code,
+               message);
     ap_fflush(scr->c->output_filters, scr->bb_out);
     
     return APR_SUCCESS;
@@ -323,8 +323,7 @@
 {
     smtpd_conn_rec *scr;
     smtpd_svr_config_rec *pConfig =
-      ap_get_module_config(c->base_server->module_config,
-                           &smtpd_module);
+      ap_get_module_config(c->base_server->module_config, &smtpd_module);
     
     if (!pConfig->bEnabled) {
         return DECLINED;
@@ -358,8 +357,7 @@
                                        int arg)
 {
     smtpd_svr_config_rec *pConfig =
-      ap_get_module_config(cmd->server->module_config,
-                           &smtpd_module);
+      ap_get_module_config(cmd->server->module_config, &smtpd_module);
     pConfig->bEnabled = arg ? 1 : 0;
 
     return NULL;
@@ -370,8 +368,7 @@
                                  const char *arg)
 {
     smtpd_svr_config_rec *pConfig =
-      ap_get_module_config(cmd->server->module_config,
-                           &smtpd_module);
+      ap_get_module_config(cmd->server->module_config, &smtpd_module);
     
     apr_cpystrn(pConfig->sId, arg, 512);
     
@@ -383,8 +380,7 @@
                                      const char *arg)
 {
     smtpd_svr_config_rec *pConfig =
-      ap_get_module_config(cmd->server->module_config,
-                           &smtpd_module);
+      ap_get_module_config(cmd->server->module_config, &smtpd_module);
     
     pConfig->max_data = atoi(arg);
     
@@ -409,8 +405,8 @@
 static void register_hooks (apr_pool_t *p)
 {
     /* register connection processor  */
-    ap_hook_process_connection(process_smtp_connection, NULL, 
-                               NULL, APR_HOOK_MIDDLE);
+    ap_hook_process_connection(process_smtp_connection, NULL, NULL,
+                               APR_HOOK_MIDDLE);
     
     smtpd_handlers = apr_hash_make(p);
     

Modified: httpd/mod_smtpd/trunk/smtp_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp_protocol.c?rev=239473&r1=239472&r2=239473&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp_protocol.c (original)
+++ httpd/mod_smtpd/trunk/smtp_protocol.c Tue Aug 23 15:39:28 2005
@@ -64,7 +64,8 @@
                      "Connection Denied");
         if (in_data.msgs) {
             smtpd_respond_multiline(scr, 550, in_data.msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550,
                                   "Connection from you denied, bye bye.");
         }
@@ -74,7 +75,8 @@
                      "Connection Denied");
         if (in_data.msgs) {
             smtpd_respond_multiline(scr, 450, in_data.msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "Connection from you temporarily "
                                   "denied, bye bye.");
         }
@@ -102,7 +104,8 @@
             if (!smtpd_handle_unrecognized_command(scr, &in_data, command,
                                                    buffer))
                 break;
-        } else {
+        }
+        else {
             if (!handle_func->func(scr, buffer, &in_data, handle_func->data))
                 break;
         }
@@ -122,7 +125,8 @@
     case SMTPD_DENY:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 521, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 521, "Command Denied");
         }
     return 521;
@@ -154,14 +158,16 @@
     case SMTPD_DENY:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 550, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550, "");
         }
         return 550;
     case SMTPD_DENYSOFT:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 450, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "");
         }
         return 450;
@@ -185,7 +191,8 @@
         apr_array_cat(first, scr->extensions);
         
         smtpd_respond_multiline(scr, 250, first);
-    } else {
+    }
+    else {
         smtpd_respond_oneline(scr, 250, str->helo);
     }
     
@@ -210,14 +217,16 @@
     case SMTPD_DENY:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 550, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550, "");
         }
         return 550;
     case SMTPD_DENYSOFT:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 450, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "");
         }
         return 450;
@@ -270,7 +279,8 @@
                      in_data->msgs ? ((char **)in_data->msgs->elts)[0] : "");  
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 550, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550, "denied");
         }
         return 550;
@@ -280,7 +290,8 @@
                      in_data->msgs ? ((char **)in_data->msgs->elts)[0] : "");  
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 450, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "temporarily denied");
         }
         return 450;
@@ -290,7 +301,8 @@
                      in_data->msgs ? ((char **)in_data->msgs->elts)[0] : "");  
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 550, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550, "denied");
         }
         /* zero to disconnect */
@@ -301,7 +313,8 @@
                      in_data->msgs ? ((char **)in_data->msgs->elts)[0] : "");  
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 450, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "temporarily denied");
         }
         /* zero to disconnect */
@@ -346,14 +359,16 @@
     case SMTPD_DENY:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 550, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550, "relaying denied");
         }
         return 550;
     case SMTPD_DENYSOFT:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 450, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "relaying temporarily denied");
         }
         return 450;
@@ -363,7 +378,8 @@
                      in_data->msgs ? ((char **)in_data->msgs->elts)[0] : "");
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 550, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 550, "relaying denied");
         }
         return 0;
@@ -373,7 +389,8 @@
                      in_data->msgs ? ((char **)in_data->msgs->elts)[0] : "");
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 450, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 450, "relaying temporarily denied");
         }
         return 0;
@@ -404,28 +421,32 @@
     case SMTPD_OK:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 250, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 250, "Queued");
         }
         return 250;
     case SMTPD_DENY:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 552, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 552, "Message denied");
         }
         return 552;
     case SMTPD_DENYSOFT:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 452, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 452, "Message denied temporarily");
         }
         return 452;
     default:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 451, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 451,
                                   "Queuing declined or disabled; "
                                   "try again later");
@@ -457,7 +478,8 @@
         /* smtpd_clear_request_rec(sr); */
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 554, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 554, "Message denied");
         }
         return 554;
@@ -466,21 +488,24 @@
         /* smtpd_clear_request_rec(sr); */
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 451, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 451, "Message denied temporarily");
         }
         return 451;
     case SMTPD_DENY_DISCONNECT:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 554, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 554, "Message denied");
         }
         return 0;
     case SMTPD_DENYSOFT_DISCONNECT:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 451, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 451, "Message denied temporarily");
         }
         return 0;
@@ -533,7 +558,8 @@
         retval = 552;
         if (in_data->msgs) {
         smtpd_respond_multiline(scr, 552, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 552, "Message denied");
         }
         break;
@@ -541,7 +567,8 @@
         retval = 452;
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 452, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 452, "Message denied temporarily");
         }
         break;
@@ -590,21 +617,24 @@
     case SMTPD_DENY:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 554, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 554, "Address denied");
         }
         return 554;
     case SMTPD_OK: /* user is okay */
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 250, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 250, "Address okay");
         }
         return 250;
     default:
         if (in_data->msgs) {
             smtpd_respond_multiline(scr, 252, in_data->msgs);
-        } else {
+        }
+        else {
             smtpd_respond_oneline(scr, 252,
                                   "Address seems fine, "
                                   "but we might not accept it.");



Mime
View raw message