Namespace fixup: use "request" consistently

1 files changed, 13 insertions, 13 deletions

diff --git a/src/util.c b/src/util.c
index ecd3173..92532f0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -164,11 +164,11 @@ get_scr_cols()
 
 
 void
-describe_query_update(eclat_command_env_t *env, int argc, char **argv,    
+describe_request_update(eclat_command_env_t *env, int argc, char **argv,    
                       const char *uparm, int n_in, int *n_out)
 {
 	int i, j, k;
-	struct ec2_query *q = env->query;
+	struct ec2_request *q = env->request;
 	char *bufptr = NULL;
 	size_t bufsize = 0;
 	struct wordsplit ws;
@@ -183,14 +183,14 @@ describe_query_update(eclat_command_env_t *env, int argc, char **argv,
 			if (uparm) {
 				grecs_asprintf(&bufptr, &bufsize,
 					       "%s.%d", uparm, upn++);
-				eclat_query_add_param(q, bufptr, argv[i]);
+				eclat_request_add_param(q, bufptr, argv[i]);
 				continue;
 			}
 			die(EX_USAGE, "malformed filter: %s", argv[i]);
 		}
 		*p++ = 0;
 		grecs_asprintf(&bufptr, &bufsize, "Filter.%d.Name", j);
-		eclat_query_add_param(q, bufptr, argv[i]);
+		eclat_request_add_param(q, bufptr, argv[i]);
 		
 		if (wordsplit(p, &ws, wsflags))
 			die(EX_SOFTWARE, "wordsplit failed at \"%s\": %s",
@@ -200,7 +200,7 @@ describe_query_update(eclat_command_env_t *env, int argc, char **argv,
 		for (k = 0; k < ws.ws_wordc; k++) {
 			grecs_asprintf(&bufptr, &bufsize, "Filter.%d.Value.%d",
 				       j, k+1);
-			eclat_query_add_param(q, bufptr, ws.ws_wordv[k]);
+			eclat_request_add_param(q, bufptr, ws.ws_wordv[k]);
 		}
 		++j;
 	}
@@ -212,14 +212,14 @@ describe_query_update(eclat_command_env_t *env, int argc, char **argv,
 }
 
 void
-describe_query_create(eclat_command_env_t *env, int argc, char **argv,    
+describe_request_create(eclat_command_env_t *env, int argc, char **argv,    
                       const char *uparm)
 {
-	describe_query_update(env, argc, argv, uparm, 1, NULL);
+	describe_request_update(env, argc, argv, uparm, 1, NULL);
 }
 	
 int
-eclat_send_query(CURL *curl, struct ec2_query *q)
+eclat_send_request(CURL *curl, struct ec2_request *req)
 {
 	char *url;
 	CURLcode res;
@@ -227,19 +227,19 @@ eclat_send_query(CURL *curl, struct ec2_query *q)
 	struct curl_slist *headers = NULL;
 	
 	/* Prepare the request */
-	eclat_query_sign(q, secret_key, signature_version);
-	url = eclat_query_to_url(q, NULL);
+	eclat_request_sign(req, secret_key, signature_version);
+	url = eclat_request_to_url(req, NULL);
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	debug(ECLAT_DEBCAT_MAIN, 1, ("using URL: %s", url));
 	free(url);
-	if (q->headers) {
+	if (req->headers) {
 		struct grecs_list_entry *ep;
 		struct grecs_txtacc *acc;
 		int rc;
 		
 		acc = grecs_txtacc_create();
 
-		for (ep = q->headers->head; ep; ep = ep->next) {
+		for (ep = req->headers->head; ep; ep = ep->next) {
 			struct ec2_param *p = ep->data;
 			char *str;
 			
@@ -273,7 +273,7 @@ eclat_send_query(CURL *curl, struct ec2_query *q)
 			rc = 1;
 		}
 	}
-	eclat_query_free(q);
+	eclat_request_free(req);
 	curl_slist_free_all(headers);
 	return rc;
 }