svn commit: r239330 - in /httpd/mod_smtpd/trunk: mod_smtpd.h smtp_core.c smtp_protocol.c

[so...@apache.org]

Author: soc-rian
Date: Mon Aug 22 21:06:55 2005
New Revision: 239330

URL: http://svn.apache.org/viewcvs?rev=239330&view=rev
Log:
improved names of structure members

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

Modified: httpd/mod_smtpd/trunk/mod_smtpd.h
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/mod_smtpd.h?rev=239330&r1=239329&r2=239330&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/mod_smtpd.h (original)
+++ httpd/mod_smtpd/trunk/mod_smtpd.h Mon Aug 22 21:06:55 2005
@@ -81,11 +81,11 @@
     apr_pool_t *p;
 
     /* where are we in the current transaction */
-    smtpd_trans_state state_vector;
+    smtpd_trans_state trans_state;
 
     /* is this esmtp or smtp */
     /* by default smtp */
-    smtpd_protocol_type extended;
+    smtpd_protocol_type protocol_type;
 
     /* hostname we were helo'd with */
     char *helo;

Modified: httpd/mod_smtpd/trunk/smtp_core.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp_core.c?rev=239330&r1=239329&r2=239330&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp_core.c (original)
+++ httpd/mod_smtpd/trunk/smtp_core.c Mon Aug 22 21:06:55 2005
@@ -242,9 +242,9 @@
 smtpd_clear_trans_rec(smtpd_trans_rec *str)
 {
   apr_pool_clear(str->p);
-  str->state_vector = SMTPD_STATE_GOT_NOTHING;
+  str->trans_state = SMTPD_STATE_GOT_NOTHING;
   str->tfp = NULL;
-  str->extended = SMTPD_PROTOCOL_SMTP;
+  str->protocol_type = SMTPD_PROTOCOL_SMTP;
   str->rcpt_to = apr_array_make(str->p, 5, sizeof(char *));
   str->mail_from = NULL;
   str->helo = NULL;

Modified: httpd/mod_smtpd/trunk/smtp_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp_protocol.c?rev=239330&r1=239329&r2=239330&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp_protocol.c (original)
+++ httpd/mod_smtpd/trunk/smtp_protocol.c Mon Aug 22 21:06:55 2005
@@ -175,8 +175,8 @@
   smtpd_reset_transaction(scr);
 
   str->helo = apr_pstrdup(str->p, buffer);
-  str->state_vector = SMTPD_STATE_GOT_HELO;
-  str->extended = SMTPD_PROTOCOL_ESMTP;
+  str->trans_state = SMTPD_STATE_GOT_HELO;
+  str->protocol_type = SMTPD_PROTOCOL_ESMTP;
 
   if (scr->extensions->nelts) {
     char **messages = apr_palloc(in_data->p, sizeof(char *) *
@@ -233,7 +233,7 @@
   smtpd_reset_transaction(scr);
   
   str->helo = apr_pstrdup(str->p, buffer);
-  str->state_vector = SMTPD_STATE_GOT_HELO;
+  str->trans_state = SMTPD_STATE_GOT_HELO;
   smtpd_respond_oneline(scr, 250, str->helo);
 
   return 250;
@@ -244,7 +244,7 @@
   char *loc;
 
   /* already got mail */
-  if (str->state_vector == SMTPD_STATE_GOT_MAIL) {
+  if (str->trans_state == SMTPD_STATE_GOT_MAIL) {
     smtpd_respond_oneline(scr, 503, "Error: Nested MAIL command");
     return 503;
   }
@@ -314,7 +314,7 @@
 
   /* default handling */
   str->mail_from = apr_pstrdup(str->p, loc);
-  str->state_vector = SMTPD_STATE_GOT_MAIL;
+  str->trans_state = SMTPD_STATE_GOT_MAIL;
   smtpd_respond_oneline(scr, 250, "Ok");
 
   return 250;
@@ -325,8 +325,8 @@
   char *loc;
 
   /* need mail first */
-  if ((str->state_vector != SMTPD_STATE_GOT_MAIL) &&
-      (str->state_vector != SMTPD_STATE_GOT_RCPT)) {
+  if ((str->trans_state != SMTPD_STATE_GOT_MAIL) &&
+      (str->trans_state != SMTPD_STATE_GOT_RCPT)) {
     smtpd_respond_oneline(scr, 503, "Error: need MAIL command");
     return 503;
   }
@@ -388,7 +388,7 @@
 
   /* add a recipient */
   (*((char **)apr_array_push(str->rcpt_to))) = apr_pstrdup(str->p, loc);
-  str->state_vector = SMTPD_STATE_GOT_RCPT;
+  str->trans_state = SMTPD_STATE_GOT_RCPT;
   smtpd_respond_oneline(scr, 250, "Ok");
 
   return 250;
@@ -487,7 +487,7 @@
     break;
   }
 
-  if (str->state_vector != SMTPD_STATE_GOT_RCPT) {
+  if (str->trans_state != SMTPD_STATE_GOT_RCPT) {
     smtpd_respond_oneline(scr, 503, "Error: need RCPT command");
     return 503;
   }