From a5459ee55432775e47d4ee1e1d126aa88c373d6b Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Wed, 19 Mar 2008 05:01:05 +0000
Subject: updated API to support mod_log_sql_dbd APR DBD driver.

---
(limited to 'mod_log_sql.c')

diff --git a/mod_log_sql.c b/mod_log_sql.c
index b6a5c83..d319e97 100644
--- a/mod_log_sql.c
+++ b/mod_log_sql.c
@@ -1201,7 +1201,7 @@ static int log_sql_transaction(request_rec *orig)
 			fields = apr_pstrcat(r->pool, fields, (showcomma ? "," : ""),
 						 item->sql_field_name, NULL);
 			values = apr_pstrcat(r->pool, values, (showcomma ? "," : ""),
-					     global_config.driver->escape(formatted_item, r->pool,&global_config.db), NULL);
+					     global_config.driver->escape(r, formatted_item, r->pool,&global_config.db), NULL);
 			showcomma = 1;
 		}
 
@@ -1216,11 +1216,11 @@ static int log_sql_transaction(request_rec *orig)
 				itemsets = apr_pstrcat(r->pool, itemsets,
 									  (i > 0 ? "," : ""),
 									  "(",
-									  global_config.driver->escape(unique_id, r->pool, &global_config.db),
+									  global_config.driver->escape(r, unique_id, r->pool, &global_config.db),
 									  ",",
-									  global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+									  global_config.driver->escape(r, *ptrptr, r->pool,&global_config.db),
 									  ",",
-									  global_config.driver->escape(theitem, r->pool,&global_config.db),
+									  global_config.driver->escape(r, theitem, r->pool,&global_config.db),
 									  ")",
 									  NULL);
 				i++;
@@ -1244,11 +1244,11 @@ static int log_sql_transaction(request_rec *orig)
 				itemsets = apr_pstrcat(r->pool, itemsets,
 									  (i > 0 ? "," : ""),
 									  "(",
-									  global_config.driver->escape(unique_id, r->pool, &global_config.db),
+									  global_config.driver->escape(r,unique_id, r->pool, &global_config.db),
 									  ",",
-									  global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+									  global_config.driver->escape(r,*ptrptr, r->pool,&global_config.db),
 									  ",",
-									  global_config.driver->escape(theitem, r->pool,&global_config.db),
+									  global_config.driver->escape(r,theitem, r->pool,&global_config.db),
 									  ")",
 									  NULL);
 				i++;
@@ -1273,11 +1273,11 @@ static int log_sql_transaction(request_rec *orig)
 				itemsets = apr_pstrcat(r->pool, itemsets,
 									  (i > 0 ? "," : ""),
 									  "(",
-									  global_config.driver->escape(unique_id, r->pool, &global_config.db),
+									  global_config.driver->escape(r,unique_id, r->pool, &global_config.db),
 									  ",",
-									  global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+									  global_config.driver->escape(r,*ptrptr, r->pool,&global_config.db),
 									  ",",
-									  global_config.driver->escape(theitem, r->pool,&global_config.db),
+									  global_config.driver->escape(r,theitem, r->pool,&global_config.db),
 									  ")",
 									  NULL);
 				i++;
@@ -1302,11 +1302,11 @@ static int log_sql_transaction(request_rec *orig)
 				itemsets = apr_pstrcat(r->pool, itemsets,
 									  (i > 0 ? "," : ""),
 									  "(",
-									  global_config.driver->escape(unique_id, r->pool, &global_config.db),
+									  global_config.driver->escape(r,unique_id, r->pool, &global_config.db),
 									  ",",
-									  global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+									  global_config.driver->escape(r,*ptrptr, r->pool,&global_config.db),
 									  ",",
-									  global_config.driver->escape(theitem, r->pool,&global_config.db),
+									  global_config.driver->escape(r,theitem, r->pool,&global_config.db),
 									  ")",
 									  NULL);
 				i++;
--
cgit v0.9.2