I noticed that mod_smtpd seems to go to some lengths to avoid messing up the global namespace, prefixing globally visible function names with smtpd_ and so forth, but there seems to be one case where this isn't done, process_smtp_connection_internal. This patch renames it to smtpd_process_connection_internal.

-garrett

* smtp.h
  (process_smtp_connection_internal): rename to...
  (smtpd_process_connection_internal): this.

* smtp_protocol.c
  (process_smtp_connection_internal): rename to...
  (smtpd_process_connection_internal): this.

* smtp_core.c
  (process_smtp_connection): update call to
   smtpd_process_connection_internal.
Index: smtp_core.c
===================================================================
--- smtp_core.c	(revision 232623)
+++ smtp_core.c	(working copy)
@@ -262,7 +262,7 @@
   r = smtpd_create_request(c);
   ap_update_child_status(r->connection->sbh, SERVER_BUSY_KEEPALIVE, r);
 
-  process_smtp_connection_internal(r);
+  smtpd_process_connection_internal(r);
 
   return OK;
 }
Index: smtp.h
===================================================================
--- smtp.h	(revision 232623)
+++ smtp.h	(working copy)
@@ -43,7 +43,7 @@
   } smtpd_handler_st;
 
   void
-  process_smtp_connection_internal(request_rec *r);
+  smtpd_process_connection_internal(request_rec *r);
 
   void
   smtpd_clear_request_rec(smtpd_request_rec *);
Index: smtp_protocol.c
===================================================================
--- smtp_protocol.c	(revision 232623)
+++ smtp_protocol.c	(working copy)
@@ -38,7 +38,7 @@
 
 #define BUFFER_STR_LEN 1024
 void
-process_smtp_connection_internal(request_rec *r)
+smtp_process_connection_internal(request_rec *r)
 {
   apr_pool_t *p;
   apr_hash_t *handlers = smtpd_get_handlers();

Reply via email to