httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From soc-r...@apache.org
Subject svn commit: r368130 - /httpd/mod_smtpd/trunk/src/smtp_protocol.c
Date Wed, 11 Jan 2006 21:03:17 GMT
Author: soc-rian
Date: Wed Jan 11 13:03:15 2006
New Revision: 368130

URL: http://svn.apache.org/viewcvs?rev=368130&view=rev
Log:
removed inline qualifiers, because inlining is a job for the optimizer.

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

Modified: httpd/mod_smtpd/trunk/src/smtp_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_protocol.c?rev=368130&r1=368129&r2=368130&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_protocol.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_protocol.c Wed Jan 11 13:03:15 2006
@@ -45,26 +45,24 @@
 extern ap_regex_t *mail_compiled_regex;
 extern ap_regex_t *rcpt_compiled_regex;
 
-/* these functions are all inlined and static because they
-   are only called from one location and only in this file */
-inline static int smtpd_handle_unrecognized_command(smtpd_conn_rec *scr,
+static int smtpd_handle_unrecognized_command(smtpd_conn_rec *scr,
                                                     smtpd_return_data *in_data,
                                                     char *command, char *data);
-inline static int smtpd_handler_ehlo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_ehlo(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_helo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_helo(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_mail(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_mail(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_rcpt(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rcpt(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_data(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_data(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_rset(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rset(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_quit(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_quit(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
-inline static int smtpd_handler_vrfy(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_vrfy(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data);
 
 #define BUFFER_STR_LEN 1024
@@ -178,7 +176,7 @@
     return;
 }
 
-inline static int smtpd_handle_unrecognized_command(smtpd_conn_rec *scr,
+static int smtpd_handle_unrecognized_command(smtpd_conn_rec *scr,
                                                     smtpd_return_data
                                                     *out_data,
                                                     char *command, char *data)
@@ -203,7 +201,7 @@
 
 }
 
-inline static int smtpd_handler_ehlo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_ehlo(smtpd_conn_rec *scr, char *buffer,
                                      smtpd_return_data *out_data)
 {
     smtpd_trans_rec *str = scr->transaction;
@@ -275,7 +273,7 @@
     return 250;
 }
 
-inline static int smtpd_handler_helo(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_helo(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     smtpd_trans_rec *str = scr->transaction;
@@ -354,7 +352,7 @@
     }
 }
 
-inline static int smtpd_handler_mail(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_mail(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     smtpd_trans_rec *str = scr->transaction;
@@ -454,8 +452,6 @@
         break;
     }
     
-    apr_table_do(do_callback, scr, mail_parameters, NULL);
-
     /* default handling */
     str->mail_from = apr_pstrdup(str->p, email_address);
     /* REVIEW: Should we not create the str->mail_parameters at reset time
@@ -472,7 +468,7 @@
     return 250;
 }
 
-inline static int smtpd_handler_rcpt(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rcpt(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     smtpd_trans_rec *str = scr->transaction;
@@ -619,7 +615,7 @@
     }
 }
 
-inline static int smtpd_handler_data(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_data(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     smtpd_trans_rec *str = scr->transaction;
@@ -802,7 +798,7 @@
     return retval;
 }
 
-inline static int smtpd_handler_rset(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_rset(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     if (buffer != NULL) {
@@ -816,7 +812,7 @@
     return 250;
 }
 
-inline static int smtpd_handler_quit(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_quit(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     if (buffer != NULL) {
@@ -831,7 +827,7 @@
     return 0;
 }
 
-inline static int smtpd_handler_vrfy(smtpd_conn_rec *scr, char *buffer,
+static int smtpd_handler_vrfy(smtpd_conn_rec *scr, char *buffer,
                        smtpd_return_data *out_data)
 {
     const char *vrfy_syntax = "^(([-[:alnum:]!#$%&'*+/=?^_`{}|~]+)|"



Mime
View raw message