[mirrorbrain-commits] r7720 - trunk/mod_mirrorbrain

Author: poeml
Date: Wed Jul 29 12:44:22 2009
New Revision: 7720
URL: http://svn.mirrorbrain.org/viewvc/mirrorbrain?view=revision&revision=7720

Log:
mod_mirrorbrain:
- rename a variable to make its meaning clearer in the context 
  (query_prep -> query_label)

Modified:
   trunk/mod_mirrorbrain/mod_mirrorbrain.c

Modified: trunk/mod_mirrorbrain/mod_mirrorbrain.c
==============================================================================
--- trunk/mod_mirrorbrain/mod_mirrorbrain.c	Wed Jul 29 12:41:48 2009	(r7719)
+++ trunk/mod_mirrorbrain/mod_mirrorbrain.c	Wed Jul 29 12:44:22 2009	(r7720)
@@ -162,7 +162,7 @@
     const char *metalink_broken_test_mirrors;
     const char *mirrorlist_stylesheet;
     const char *query;
-    const char *query_prep;
+    const char *query_label;
 } mb_server_conf;
 
 
@@ -247,14 +247,14 @@
         mb_server_conf *cfg = ap_get_module_config(sp->module_config, 
                                                         &mirrorbrain_module);
         /* make a label */
-        cfg->query_prep = apr_psprintf(pconf, "mirrorbrain_dbd_%d", ++label_num);
-        mb_dbd_prepare_fn(sp, cfg->query, cfg->query_prep);
+        cfg->query_label = apr_psprintf(pconf, "mirrorbrain_dbd_%d", ++label_num);
+        mb_dbd_prepare_fn(sp, cfg->query, cfg->query_label);
 
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                     "[mod_mirrorbrain] prepared: server %s, label_num %d, query_prep %s", 
+                     "[mod_mirrorbrain] prepared: server %s, label_num %d, query_label %s", 
                      s->server_hostname, 
                      label_num,
-                     cfg->query_prep);
+                     cfg->query_label);
     }
 
     return OK;
@@ -326,7 +326,7 @@
     new->metalink_broken_test_mirrors = NULL;
     new->mirrorlist_stylesheet = NULL;
     new->query = DEFAULT_QUERY;
-    new->query_prep = NULL;
+    new->query_label = NULL;
 
     return (void *) new;
 }
@@ -351,7 +351,7 @@
     cfgMergeString(metalink_broken_test_mirrors);
     cfgMergeString(mirrorlist_stylesheet);
     mrg->query = (add->query != (char *) DEFAULT_QUERY) ? add->query : base->query;
-    cfgMergeString(query_prep);
+    cfgMergeString(query_label);
 
     return (void *) mrg;
 }
@@ -987,7 +987,7 @@
 
     /* ask the database and pick the matching server according to region */
 
-    if (scfg->query_prep == NULL) {
+    if (scfg->query_label == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "[mod_mirrorbrain] No database query prepared!");
         return DECLINED;
     }
@@ -1000,12 +1000,12 @@
     }
     debugLog(r, cfg, "Successfully acquired database connection.");
 
-    statement = apr_hash_get(dbd->prepared, scfg->query_prep, APR_HASH_KEY_STRING);
+    statement = apr_hash_get(dbd->prepared, scfg->query_label, APR_HASH_KEY_STRING);
 
     if (statement == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
                       "[mod_mirrorbrain] Could not get prepared statement labelled '%s'",
-                      scfg->query_prep);
+                      scfg->query_label);
 
         /* log existing prepared statements. It might help with figuring out
          * misconfigurations */


_______________________________________________
mirrorbrain-commits mailing list
Archive: http://mirrorbrain.org/archive/mirrorbrain-commits/

Note: To remove yourself from this list, send a mail with the content
 	unsubscribe
to the address mirrorbrain-commits-request_at_mirrorbrain.org