[tcl-rivet] branch master updated: add macro RIVET_MPM_BRIDGE to compose bridge names

[mxmanghi]

This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git


The following commit(s) were added to refs/heads/master by this push:
     new cb3ac68  add macro RIVET_MPM_BRIDGE to compose bridge names
cb3ac68 is described below

commit cb3ac686a18a4af25de47bd3710a1e51a4b98953
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Fri Nov 2 19:20:12 2018 +0100

    add macro RIVET_MPM_BRIDGE to compose bridge names
---
 ChangeLog                    | 4 ++++
 src/mod_rivet_ng/mod_rivet.c | 2 +-
 src/mod_rivet_ng/mod_rivet.h | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 301bf41..51037a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-02 Massimo Manghi <mxman...@apache.org>
+    * src/mod_rivet_ng/mod_rivet.[c|h]: add macro RIVET_MPM_BRIDGE to
+    compose rivet bridge names
+
 2018-10-17 Massimo Manghi <mxman...@apache.org>
     * tests/commands.tcl: changing test on self closing element
     * [doc/rivet.xml.in|doc/rivet.xml]: removed delimiters of
diff --git a/src/mod_rivet_ng/mod_rivet.c b/src/mod_rivet_ng/mod_rivet.c
index 1c24e67..de15995 100644
--- a/src/mod_rivet_ng/mod_rivet.c
+++ b/src/mod_rivet_ng/mod_rivet.c
@@ -104,7 +104,7 @@ Rivet_SeekMPMBridge (apr_pool_t* pool,server_rec* server)
         apr_finfo_t finfo;
         char*       proposed_bridge;
 
-        proposed_bridge = 
apr_pstrcat(pool,RIVET_DIR,"/mpm/rivet_",rsc->mpm_bridge,"_mpm.so",NULL);
+        proposed_bridge = 
apr_pstrcat(pool,RIVET_MPM_BRIDGE_COMPOSE(rsc->mpm_bridge),NULL);
         if (apr_stat(&finfo,proposed_bridge,APR_FINFO_MIN,pool) == APR_SUCCESS)
         {
             mpm_bridge_path = proposed_bridge;
diff --git a/src/mod_rivet_ng/mod_rivet.h b/src/mod_rivet_ng/mod_rivet.h
index 65225a0..428258d 100644
--- a/src/mod_rivet_ng/mod_rivet.h
+++ b/src/mod_rivet_ng/mod_rivet.h
@@ -320,4 +320,6 @@ Tcl_Obj* Rivet_CurrentServerRec (Tcl_Interp* interp, 
server_rec* s);
 
 #define RIVET_MPM_BRIDGE rivet_bridge_table bridge_jump_table =
 
+#define RIVET_MPM_BRIDGE_COMPOSE(bridge) 
RIVET_DIR,"/mpm/rivet_",bridge,"_mpm.so"
+
 #endif /* MOD_RIVET_H */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org