Namespace cleanup.

Rename "access method" to "dictionary".
All sources affected.

* src/method.c: renamed to...
* src/dictionary.c: ... this.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/verify.c b/src/verify.c
index ed5f0cf..1b528aa 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -196,7 +196,7 @@ int
 verify_directive_file (struct file_triplet *trp, const struct spool *spool)
 {
   char *command;
-  struct access_method *method = spool->access_method[project_uploader_method];
+  struct dictionary *dict = spool->dictionary[project_uploader_dict];
   int rc;
   void *md;
 
@@ -209,36 +209,36 @@ verify_directive_file (struct file_triplet *trp, const struct spool *spool)
   if (fill_project_name (trp))
     return 1;
   
-  md = method_open (method);
+  md = dictionary_open (dict);
   if (!md)
     return 1;
 
-  command = triplet_expand_method_query (method, md, trp);
+  command = triplet_expand_dictionary_query (dict, md, trp);
 
-  rc = method_run (method, md, command);
+  rc = dictionary_lookup (dict, md, command);
   free (command);
   if (rc)
     {
       logmsg (LOG_ERR, _("cannot get uploaders for %s"), trp->name);
-      method_close (method, md);
+      dictionary_close (dict, md);
       return 1;
     }
 
-  nrows = method_num_rows (method);
+  nrows = dictionary_num_rows (dict);
   if (nrows == 0)
     {
       logmsg (LOG_ERR, _("found no uploaders for %s"), trp->name);
-      method_close (method, md);
+      dictionary_close (dict, md);
       return 1;
     }
 
-  ncols = method_num_cols (method);
+  ncols = dictionary_num_cols (dict);
   if (ncols < 4)
     {
       logmsg (LOG_ERR,
-	      _("project-uploader method error: too few columns (%lu)"),
+	      _("project-uploader dictionary error: too few columns (%lu)"),
 	      (unsigned long) ncols);
-      method_close (method, md);
+      dictionary_close (dict, md);
       return 1;
     }
 
@@ -249,16 +249,16 @@ verify_directive_file (struct file_triplet *trp, const struct spool *spool)
       struct uploader_info info, *ptr;
       
       memset (&info, 0, sizeof (info));
-      p = method_result (method, md, i, 0);
+      p = dictionary_result (dict, md, i, 0);
       if (p)
 	info.name = xstrdup (p);
-      p = method_result (method, md, i, 1);
+      p = dictionary_result (dict, md, i, 1);
       if (p)
 	info.realname = xstrdup (p);
-      p = method_result (method, md, i, 2);
+      p = dictionary_result (dict, md, i, 2);
       if (p)
 	info.email = xstrdup (p);
-      p = method_result (method, md, i, 3);
+      p = dictionary_result (dict, md, i, 3);
       if (p)
 	info.gpg_key = xstrdup (p);
       
@@ -273,7 +273,7 @@ verify_directive_file (struct file_triplet *trp, const struct spool *spool)
       if (!info.name || !info.realname || !info.gpg_key || !info.email)
 	{
 	  logmsg (LOG_ERR,
-		  _("project-uploader method error: malformed row %lu"),
+		  _("project-uploader dictionary error: malformed row %lu"),
 		  (unsigned long) i);
 	  free (info.name);
 	  free (info.realname);
@@ -290,7 +290,7 @@ verify_directive_file (struct file_triplet *trp, const struct spool *spool)
       tail = ptr;
     }
 	  
-  method_close (method, md);
+  dictionary_close (dict, md);
 
   if (!head)
     {