aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2015-01-22 23:59:22 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2015-01-23 00:03:33 +0200
commitb1824338b366e25756e4c64f04e535684529832d (patch)
tree2dcbf32e0b4fb06b1c4b0a992db882ba184bbd18
parent2beaaadb282bd4667e3af1ed65e3944960d1bd3e (diff)
downloadeclat-b1824338b366e25756e4c64f04e535684529832d.tar.gz
eclat-b1824338b366e25756e4c64f04e535684529832d.tar.bz2
Namespace fixup: use "request" consistently
-rw-r--r--lib/Makefile.am10
-rw-r--r--lib/libeclat.h24
-rw-r--r--lib/req2url.c (renamed from lib/q2url.c)6
-rw-r--r--lib/reqaddparm.c (renamed from lib/qaddparm.c)28
-rw-r--r--lib/reqcreat.c (renamed from lib/qcreat.c)26
-rw-r--r--lib/reqencode.c (renamed from lib/qencode.c)4
-rw-r--r--lib/reqfree.c (renamed from lib/qfree.c)10
-rw-r--r--lib/reqsign.c56
-rw-r--r--src/allocaddr.c2
-rw-r--r--src/asscaddr.c12
-rw-r--r--src/atvol.c6
-rw-r--r--src/cpimg.c10
-rw-r--r--src/cpsnap.c8
-rw-r--r--src/deimg.c2
-rw-r--r--src/devmap.c20
-rw-r--r--src/devol.c10
-rw-r--r--src/disasaddr.c4
-rw-r--r--src/ec2map.c14
-rw-r--r--src/eclat.c6
-rw-r--r--src/eclat.h10
-rw-r--r--src/getconout.c2
-rw-r--r--src/lsaattr.c6
-rw-r--r--src/lsaddr.c2
-rw-r--r--src/lsiattr.c6
-rw-r--r--src/lsimg-cl.opt8
-rw-r--r--src/lsimg.c2
-rw-r--r--src/lsinst.c2
-rw-r--r--src/lsistat.c4
-rw-r--r--src/lsreg.c2
-rw-r--r--src/lssattr.c18
-rw-r--r--src/lssg.c2
-rw-r--r--src/lssnap.c4
-rw-r--r--src/lstag.c6
-rw-r--r--src/lsvol.c2
-rw-r--r--src/lszon.c2
-rw-r--r--src/mkimg.c10
-rw-r--r--src/mkinst.c64
-rw-r--r--src/mksg.c8
-rw-r--r--src/mksnap.c4
-rw-r--r--src/mktags.c14
-rw-r--r--src/mkvol.c12
-rw-r--r--src/rmaddr.c2
-rw-r--r--src/rmsg.c4
-rw-r--r--src/rmsnap.c4
-rw-r--r--src/rmvol.c4
-rw-r--r--src/setaattr.c10
-rw-r--r--src/setiattr.c14
-rw-r--r--src/sg-cl.opt6
-rw-r--r--src/sg.c18
-rw-r--r--src/startstop.c4
-rw-r--r--src/util.c26
51 files changed, 271 insertions, 269 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bdc7d76..5cfa67a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -56,7 +56,7 @@ libeclat_a_SOURCES=\
path.c\
- q2url.c\
- qaddparm.c\
- qcreat.c\
- qencode.c\
- qfree.c\
+ req2url.c\
+ reqaddparm.c\
+ reqcreat.c\
+ reqencode.c\
+ reqfree.c\
reqsign.c\
diff --git a/lib/libeclat.h b/lib/libeclat.h
index edd26eb..a5c8c79 100644
--- a/lib/libeclat.h
+++ b/lib/libeclat.h
@@ -87,7 +87,7 @@ struct ec2_param {
-#define EC2_QF_HTTPS 0x01
-#define EC2_QF_POST 0x02
+#define EC2_RF_HTTPS 0x01
+#define EC2_RF_POST 0x02
-struct ec2_query {
- int flags; /* Composed from EC2_QF_* bits */
+struct ec2_request {
+ int flags; /* Composed from EC2_RF_* bits */
char *endpoint; /* endpoint */
@@ -102,18 +102,18 @@ struct ec2_query {
-struct ec2_query *eclat_query_create(int flags, const char *endpoint,
+struct ec2_request *eclat_request_create(int flags, const char *endpoint,
const char *uri, char const *region,
char const *access_key, char const *token);
-void eclat_query_free(struct ec2_query *);
-void eclat_query_add_param(struct ec2_query *q, const char *name,
+void eclat_request_free(struct ec2_request *);
+void eclat_request_add_param(struct ec2_request *q, const char *name,
const char *value);
-void eclat_query_add_param_encoded(struct ec2_query *q, const char *name,
+void eclat_request_add_param_encoded(struct ec2_request *q, const char *name,
const char *value);
-void eclat_query_add_header(struct ec2_query *q, const char *name,
+void eclat_request_add_header(struct ec2_request *q, const char *name,
const char *value);
-void eclat_query_sign(struct ec2_query *req, char *secret, char *version);
+void eclat_request_sign(struct ec2_request *req, char *secret, char *version);
-char *eclat_query_to_url(struct ec2_query *req, char **post_params);
+char *eclat_request_to_url(struct ec2_request *req, char **post_params);
-void eclat_query_encode(struct ec2_query *q);
+void eclat_request_encode(struct ec2_request *q);
diff --git a/lib/q2url.c b/lib/req2url.c
index 6404f33..25277a2 100644
--- a/lib/q2url.c
+++ b/lib/req2url.c
@@ -45,3 +45,3 @@ add_param(void *sym, void *data)
char *
-eclat_query_to_url(struct ec2_query *req, char **post_params)
+eclat_request_to_url(struct ec2_request *req, char **post_params)
{
@@ -54,3 +54,3 @@ eclat_query_to_url(struct ec2_query *req, char **post_params)
grecs_txtacc_grow(acc, "http", 4);
- if (req->flags & EC2_QF_HTTPS)
+ if (req->flags & EC2_RF_HTTPS)
grecs_txtacc_grow_char(acc, 's');
@@ -60,3 +60,3 @@ eclat_query_to_url(struct ec2_query *req, char **post_params)
- if (req->flags & EC2_QF_POST) {
+ if (req->flags & EC2_RF_POST) {
grecs_txtacc_grow_char(acc, 0);
diff --git a/lib/qaddparm.c b/lib/reqaddparm.c
index 7328534..916bf92 100644
--- a/lib/qaddparm.c
+++ b/lib/reqaddparm.c
@@ -22,3 +22,3 @@
void
-eclat_query_add_param0(struct ec2_query *q, const char *name,
+eclat_request_add_param0(struct ec2_request *req, const char *name,
const char *value, int encoded)
@@ -29,3 +29,3 @@ eclat_query_add_param0(struct ec2_query *q, const char *name,
key.name = (char*) name;
- p = grecs_symtab_lookup_or_install(q->params, &key, &install);
+ p = grecs_symtab_lookup_or_install(req->params, &key, &install);
if (!install)
@@ -37,5 +37,6 @@ eclat_query_add_param0(struct ec2_query *q, const char *name,
void
-eclat_query_add_param(struct ec2_query *q, const char *name, const char *value)
+eclat_request_add_param(struct ec2_request *req, const char *name,
+ const char *value)
{
- eclat_query_add_param0(q, name, value, 0);
+ eclat_request_add_param0(req, name, value, 0);
}
@@ -43,4 +44,4 @@ eclat_query_add_param(struct ec2_query *q, const char *name, const char *value)
void
-eclat_query_add_param_encoded(struct ec2_query *q, const char *name,
- const char *value)
+eclat_request_add_param_encoded(struct ec2_request *req, const char *name,
+ const char *value)
{
@@ -49,6 +50,6 @@ eclat_query_add_param_encoded(struct ec2_query *q, const char *name,
urlencode(value, strlen(value), &str, NULL);
- eclat_query_add_param0(q, name, str, 1);
+ eclat_request_add_param0(req, name, str, 1);
free(str);
} else
- eclat_query_add_param0(q, name, value, 1);
+ eclat_request_add_param0(req, name, value, 1);
}
@@ -66,3 +67,4 @@ free_header(void *data)
void
-eclat_query_add_header(struct ec2_query *q, const char *name, const char *value)
+eclat_request_add_header(struct ec2_request *req, const char *name,
+ const char *value)
{
@@ -70,5 +72,5 @@ eclat_query_add_header(struct ec2_query *q, const char *name, const char *value)
- if (!q->headers) {
- q->headers = grecs_list_create();
- q->headers->free_entry = free_header;
+ if (!req->headers) {
+ req->headers = grecs_list_create();
+ req->headers->free_entry = free_header;
}
@@ -89,3 +91,3 @@ eclat_query_add_header(struct ec2_query *q, const char *name, const char *value)
ent->value = NULL;
- grecs_list_append(q->headers, ent);
+ grecs_list_append(req->headers, ent);
}
diff --git a/lib/qcreat.c b/lib/reqcreat.c
index 3028b4f..65f7880 100644
--- a/lib/qcreat.c
+++ b/lib/reqcreat.c
@@ -29,4 +29,4 @@ ec2_param_free(void *ptr)
-struct ec2_query *
-eclat_query_create(int flags, const char *endpoint, const char *uri,
+struct ec2_request *
+eclat_request_create(int flags, const char *endpoint, const char *uri,
char const *region, char const *access_key,
@@ -34,5 +34,5 @@ eclat_query_create(int flags, const char *endpoint, const char *uri,
{
- struct ec2_query *q = grecs_zalloc(sizeof(*q));
- q->flags = flags;
- q->params = grecs_symtab_create(sizeof(struct ec2_param),
+ struct ec2_request *req = grecs_zalloc(sizeof(*req));
+ req->flags = flags;
+ req->params = grecs_symtab_create(sizeof(struct ec2_param),
NULL,
@@ -42,10 +42,10 @@ eclat_query_create(int flags, const char *endpoint, const char *uri,
ec2_param_free);
- eclat_query_add_param(q, "Version", EC2_API_VERSION);
- q->endpoint = grecs_strdup(endpoint);
- q->uri = grecs_strdup(uri);
- q->ttl = 5;
- q->region = grecs_strdup(region ? region : "us-east-1");
- q->access_key = grecs_strdup(access_key);
- q->token = token ? grecs_strdup(token) : NULL;
- return q;
+ eclat_request_add_param(req, "Version", EC2_API_VERSION);
+ req->endpoint = grecs_strdup(endpoint);
+ req->uri = grecs_strdup(uri);
+ req->ttl = 5;
+ req->region = grecs_strdup(region ? region : "us-east-1");
+ req->access_key = grecs_strdup(access_key);
+ req->token = token ? grecs_strdup(token) : NULL;
+ return req;
}
diff --git a/lib/qencode.c b/lib/reqencode.c
index bb4284c..70ac16d 100644
--- a/lib/qencode.c
+++ b/lib/reqencode.c
@@ -37,5 +37,5 @@ encode_param(void *sym, void *data)
void
-eclat_query_encode(struct ec2_query *q)
+eclat_request_encode(struct ec2_request *req)
{
- grecs_symtab_enumerate(q->params, encode_param, NULL);
+ grecs_symtab_enumerate(req->params, encode_param, NULL);
}
diff --git a/lib/qfree.c b/lib/reqfree.c
index bbdc991..f5145a4 100644
--- a/lib/qfree.c
+++ b/lib/reqfree.c
@@ -21,8 +21,8 @@
void
-eclat_query_free(struct ec2_query *q)
+eclat_request_free(struct ec2_request *req)
{
- free(q->endpoint);
- free(q->uri);
- grecs_symtab_free(q->params);
- free(q);
+ free(req->endpoint);
+ free(req->uri);
+ grecs_symtab_free(req->params);
+ free(req);
}
diff --git a/lib/reqsign.c b/lib/reqsign.c
index 6acf80e..f3083c6 100644
--- a/lib/reqsign.c
+++ b/lib/reqsign.c
@@ -46,3 +46,3 @@ compnames(const void *a, const void *b)
static void
-querysign2(struct ec2_query *req, char *secret)
+requestsign2(struct ec2_request *req, char *secret)
{
@@ -63,7 +63,7 @@ querysign2(struct ec2_query *req, char *secret)
/* Add default parameters */
- eclat_query_add_param(req, "AWSAccessKeyId", req->access_key);
- eclat_query_add_param(req, "SignatureMethod", "HmacSHA256");
- eclat_query_add_param(req, "SignatureVersion", "2");
+ eclat_request_add_param(req, "AWSAccessKeyId", req->access_key);
+ eclat_request_add_param(req, "SignatureMethod", "HmacSHA256");
+ eclat_request_add_param(req, "SignatureVersion", "2");
if (req->token)
- eclat_query_add_param(req, "SecurityToken", req->token);
+ eclat_request_add_param(req, "SecurityToken", req->token);
@@ -71,5 +71,5 @@ querysign2(struct ec2_query *req, char *secret)
strftime(tsbuf, sizeof(tsbuf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&t));
- eclat_query_add_param(req, "Timestamp", tsbuf);
+ eclat_request_add_param(req, "Timestamp", tsbuf);
- eclat_query_encode(req);
+ eclat_request_encode(req);
@@ -83,3 +83,3 @@ querysign2(struct ec2_query *req, char *secret)
- verb = (req->flags & EC2_QF_POST) ? "POST" : "GET";
+ verb = (req->flags & EC2_RF_POST) ? "POST" : "GET";
grecs_txtacc_grow_string(acc, verb);
@@ -91,3 +91,3 @@ querysign2(struct ec2_query *req, char *secret)
- /* Append a canonicalized query string */
+ /* Append a canonicalized request string */
for (i = 0; i < n; i++) {
@@ -114,3 +114,3 @@ querysign2(struct ec2_query *req, char *secret)
(unsigned char**) &signature, &siglen);
- eclat_query_add_param_encoded(req, "Signature", signature);
+ eclat_request_add_param_encoded(req, "Signature", signature);
free(signature);
@@ -123,3 +123,3 @@ querysign2(struct ec2_query *req, char *secret)
strftime(tsbuf, sizeof(tsbuf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&t));
- eclat_query_add_param(req, "Expires", tsbuf);
+ eclat_request_add_param(req, "Expires", tsbuf);
*/
@@ -150,3 +150,3 @@ eclat_hex_encode(unsigned char *input, size_t inlen,
static void
-querysign4(struct ec2_query *req, char *secret)
+requestsign4(struct ec2_request *req, char *secret)
{
@@ -198,7 +198,7 @@ querysign4(struct ec2_query *req, char *secret)
- eclat_query_add_header(req, "Host", req->endpoint);
- eclat_query_add_header(req, "X-Amz-Date", tsbuf);
+ eclat_request_add_header(req, "Host", req->endpoint);
+ eclat_request_add_header(req, "X-Amz-Date", tsbuf);
- /* Encode the query */
- eclat_query_encode(req);
+ /* Encode the request */
+ eclat_request_encode(req);
@@ -213,3 +213,3 @@ querysign4(struct ec2_query *req, char *secret)
/* Create a canonical request */
- verb = (req->flags & EC2_QF_POST) ? "POST" : "GET";
+ verb = (req->flags & EC2_RF_POST) ? "POST" : "GET";
grecs_txtacc_grow_string(acc, verb);
@@ -218,3 +218,3 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_char(acc, '\n');
- /* Append a canonicalized query string */
+ /* Append a canonicalized request string */
for (i = 0; i < n; i++) {
@@ -253,4 +253,4 @@ querysign4(struct ec2_query *req, char *secret)
/* Payload hash */
- if (req->flags & EC2_QF_POST) {
- /* FIXME: payload = req->query */
+ if (req->flags & EC2_RF_POST) {
+ /* FIXME: payload = req->request */
err("%s:%d: POST is not yet implemented", __FILE__, __LINE__);
@@ -321,3 +321,3 @@ querysign4(struct ec2_query *req, char *secret)
if (req->token)
- eclat_query_add_header(req, "X-Amz-Security-Token", req->token);
+ eclat_request_add_header(req, "X-Amz-Security-Token", req->token);
@@ -333,3 +333,3 @@ querysign4(struct ec2_query *req, char *secret)
p = grecs_txtacc_finish(acc, 0);
- eclat_query_add_header(req, "Authorization", p);
+ eclat_request_add_header(req, "Authorization", p);
@@ -337,4 +337,4 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_free(acc);
- /* Encode the query */
- eclat_query_encode(req);
+ /* Encode the request */
+ eclat_request_encode(req);
}
@@ -344,3 +344,3 @@ struct qsimpl {
char *qs_version;
- void (*qs_fun)(struct ec2_query *, char *);
+ void (*qs_fun)(struct ec2_request *, char *);
};
@@ -348,4 +348,4 @@ struct qsimpl {
static struct qsimpl qstab[] = {
- { "2", querysign2 },
- { "4", querysign4 },
+ { "2", requestsign2 },
+ { "4", requestsign4 },
{ NULL }
@@ -354,3 +354,3 @@ static struct qsimpl qstab[] = {
void
-eclat_query_sign(struct ec2_query *req, char *secret, char *version)
+eclat_request_sign(struct ec2_request *req, char *secret, char *version)
{
diff --git a/src/allocaddr.c b/src/allocaddr.c
index 9d8d6d8..b6cf133 100644
--- a/src/allocaddr.c
+++ b/src/allocaddr.c
@@ -33,3 +33,3 @@ eclat_allocate_address(eclat_command_env_t *env, int argc, char **argv)
if (vpc)
- eclat_query_add_param(env->query, "Domain", "vpc");
+ eclat_request_add_param(env->request, "Domain", "vpc");
return 0;
diff --git a/src/asscaddr.c b/src/asscaddr.c
index 3e6ca44..26e5d5c 100644
--- a/src/asscaddr.c
+++ b/src/asscaddr.c
@@ -36,13 +36,13 @@ eclat_associate_address(eclat_command_env_t *env, int argc, char **argv)
translate_ids(1, argv, MAP_INSTANCE);
- eclat_query_add_param(env->query, "InstanceId", argv[0]);
+ eclat_request_add_param(env->request, "InstanceId", argv[0]);
if (vpc) {
- eclat_query_add_param(env->query, "AllocationId", argv[1]);
+ eclat_request_add_param(env->request, "AllocationId", argv[1]);
if (iface)
- eclat_query_add_param(env->query, "NetworkInterfaceId",
+ eclat_request_add_param(env->request, "NetworkInterfaceId",
iface);
if (privaddr)
- eclat_query_add_param(env->query, "PrivateIpAddress",
+ eclat_request_add_param(env->request, "PrivateIpAddress",
privaddr);
if (reassoc)
- eclat_query_add_param(env->query, "AllowReassociation",
+ eclat_request_add_param(env->request, "AllowReassociation",
"true");
@@ -50,3 +50,3 @@ eclat_associate_address(eclat_command_env_t *env, int argc, char **argv)
} else {
- eclat_query_add_param(env->query, "PublicIp", argv[1]);
+ eclat_request_add_param(env->request, "PublicIp", argv[1]);
}
diff --git a/src/atvol.c b/src/atvol.c
index b07bea2..36abcb5 100644
--- a/src/atvol.c
+++ b/src/atvol.c
@@ -37,5 +37,5 @@ eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv)
- eclat_query_add_param(env->query, "VolumeId", argv[0]);
- eclat_query_add_param(env->query, "InstanceId", argv[1]);
- eclat_query_add_param(env->query, "Device", argv[2]);
+ eclat_request_add_param(env->request, "VolumeId", argv[0]);
+ eclat_request_add_param(env->request, "InstanceId", argv[1]);
+ eclat_request_add_param(env->request, "Device", argv[2]);
diff --git a/src/cpimg.c b/src/cpimg.c
index fa9db23..ef92ffb 100644
--- a/src/cpimg.c
+++ b/src/cpimg.c
@@ -22,11 +22,11 @@ eclat_copy_image(eclat_command_env_t *env, int argc, char **argv)
{
- struct ec2_query *q = env->query;
+ struct ec2_request *q = env->request;
parse_options(env, argc, argv);
- eclat_query_add_param(q, "SourceRegion", region);
- eclat_query_add_param(q, "SourceImageId", image);
+ eclat_request_add_param(q, "SourceRegion", region);
+ eclat_request_add_param(q, "SourceImageId", image);
if (name)
- eclat_query_add_param(q, "Name", name);
+ eclat_request_add_param(q, "Name", name);
if (descr)
- eclat_query_add_param(q, "Description", descr);
+ eclat_request_add_param(q, "Description", descr);
return 0;
diff --git a/src/cpsnap.c b/src/cpsnap.c
index 16de3f2..93e6535 100644
--- a/src/cpsnap.c
+++ b/src/cpsnap.c
@@ -22,3 +22,3 @@ eclat_copy_snapshot(eclat_command_env_t *env, int argc, char **argv)
{
- struct ec2_query *q = env->query;
+ struct ec2_request *q = env->request;
@@ -26,6 +26,6 @@ eclat_copy_snapshot(eclat_command_env_t *env, int argc, char **argv)
- eclat_query_add_param(q, "SourceRegion", region);
- eclat_query_add_param(q, "SourceSnapshotId", image);
+ eclat_request_add_param(q, "SourceRegion", region);
+ eclat_request_add_param(q, "SourceSnapshotId", image);
if (descr)
- eclat_query_add_param(q, "Description", descr);
+ eclat_request_add_param(q, "Description", descr);
return 0;
diff --git a/src/deimg.c b/src/deimg.c
index b607fd5..67e5444 100644
--- a/src/deimg.c
+++ b/src/deimg.c
@@ -32,3 +32,3 @@ eclat_deregister_image(eclat_command_env_t *env, int argc, char **argv)
translate_ids(argc, argv, MAP_IMAGE);
- eclat_query_add_param(env->query, "ImageId", argv[0]);
+ eclat_request_add_param(env->request, "ImageId", argv[0]);
return 0;
diff --git a/src/devmap.c b/src/devmap.c
index 9f9a85a..54308bc 100644
--- a/src/devmap.c
+++ b/src/devmap.c
@@ -28,3 +28,3 @@ isnumstr(const char *p)
void
-eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
+eclat_encode_devmap(struct ec2_request *q, struct grecs_list *list)
{
@@ -48,3 +48,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr, dev);
+ eclat_request_add_param(q, bufptr, dev);
@@ -54,3 +54,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr, NULL);
+ eclat_request_add_param(q, bufptr, NULL);
} else if (strncmp(p, "ephemeral", 9) == 0) {
@@ -59,3 +59,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr, p);
+ eclat_request_add_param(q, bufptr, p);
} else {
@@ -97,3 +97,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
}
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[0]);
@@ -109,3 +109,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[0]);
@@ -118,3 +118,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[1]);
@@ -133,3 +133,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[4]);
@@ -142,3 +142,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[3]);
@@ -158,3 +158,3 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[2]);
diff --git a/src/devol.c b/src/devol.c
index ceda9be..76a8423 100644
--- a/src/devol.c
+++ b/src/devol.c
@@ -24,3 +24,3 @@ eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv)
int i;
- struct ec2_query *q = env->query;
+ struct ec2_request *q = env->request;
@@ -35,11 +35,11 @@ eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv)
- eclat_query_add_param(q, "VolumeId", argv[0]);
+ eclat_request_add_param(q, "VolumeId", argv[0]);
if (argc > 1) {
translate_ids(1, argv + 1, MAP_INSTANCE);
- eclat_query_add_param(q, "InstanceId", argv[1]);
+ eclat_request_add_param(q, "InstanceId", argv[1]);
if (argc > 2)
- eclat_query_add_param(q, "Device", argv[2]);
+ eclat_request_add_param(q, "Device", argv[2]);
}
if (force)
- eclat_query_add_param(q, "Force", "true");
+ eclat_request_add_param(q, "Force", "true");
return 0;
diff --git a/src/disasaddr.c b/src/disasaddr.c
index 27711f6..8c6b88c 100644
--- a/src/disasaddr.c
+++ b/src/disasaddr.c
@@ -24,3 +24,3 @@ eclat_disassociate_address(eclat_command_env_t *env, int argc, char **argv)
int i;
- struct ec2_query *q = env->query;
+ struct ec2_request *q = env->request;
@@ -33,3 +33,3 @@ eclat_disassociate_address(eclat_command_env_t *env, int argc, char **argv)
- eclat_query_add_param(q, vpc ? "AssociationId" : "PublicIp", argv[0]);
+ eclat_request_add_param(q, vpc ? "AssociationId" : "PublicIp", argv[0]);
diff --git a/src/ec2map.c b/src/ec2map.c
index 943409c..6e2be10 100644
--- a/src/ec2map.c
+++ b/src/ec2map.c
@@ -140,3 +140,3 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
struct ec2_map *map = data;
- struct ec2_query *q;
+ struct ec2_request *q;
struct grecs_list_entry *ep;
@@ -148,5 +148,5 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
- q = eclat_query_create(use_ssl ? EC2_QF_HTTPS : 0, endpoint, "/",
+ q = eclat_request_create(use_ssl ? EC2_RF_HTTPS : 0, endpoint, "/",
region_name, access_key, security_token);
- eclat_query_add_param(q, "Action", map->action);
+ eclat_request_add_param(q, "Action", map->action);
@@ -173,5 +173,5 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
*p++ = 0;
- eclat_query_add_param(q, ws.ws_wordv[0], p);
+ eclat_request_add_param(q, ws.ws_wordv[0], p);
} else
- eclat_query_add_param(q, ws.ws_wordv[0], "");
+ eclat_request_add_param(q, ws.ws_wordv[0], "");
}
@@ -182,3 +182,3 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
if (rc) {
- eclat_query_free(q);
+ eclat_request_free(q);
return eclat_map_failure;
@@ -186,3 +186,3 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value)
- rc = eclat_send_query(map->io->curl, q);
+ rc = eclat_send_request(map->io->curl, q);
diff --git a/src/eclat.c b/src/eclat.c
index 66cabdc..beaa934 100644
--- a/src/eclat.c
+++ b/src/eclat.c
@@ -648,3 +648,3 @@ eclat_do_command(eclat_command_env_t *env, struct eclat_command *command,
if (!(command->flags & CMD_NOQRY)) {
- env->query = eclat_query_create(use_ssl ? EC2_QF_HTTPS : 0,
+ env->request = eclat_request_create(use_ssl ? EC2_RF_HTTPS : 0,
endpoint, "/",
@@ -655,3 +655,3 @@ eclat_do_command(eclat_command_env_t *env, struct eclat_command *command,
if (command->tag)
- eclat_query_add_param(env->query, "Action", command->tag);
+ eclat_request_add_param(env->request, "Action", command->tag);
@@ -663,3 +663,3 @@ eclat_do_command(eclat_command_env_t *env, struct eclat_command *command,
die(EX_CANCELLED, "command not confirmed");
- rc = eclat_send_query(env->curl, env->query);
+ rc = eclat_send_request(env->curl, env->request);
}
diff --git a/src/eclat.h b/src/eclat.h
index 28fcaf0..a8ac2a0 100644
--- a/src/eclat.h
+++ b/src/eclat.h
@@ -83,3 +83,3 @@ struct eclat_command_env {
CURL *curl;
- struct ec2_query *query;
+ struct ec2_request *request;
};
@@ -182,8 +182,8 @@ void set_command_format(const char *name, const char *format,
-void describe_query_create(eclat_command_env_t *env, int argc, char **argv,
+void describe_request_create(eclat_command_env_t *env, int argc, char **argv,
const char *uparm);
-void describe_query_update(eclat_command_env_t *env, int argc, char **argv,
+void describe_request_update(eclat_command_env_t *env, int argc, char **argv,
const char *uparm, int n_in, int *n_out);
-int eclat_send_query(CURL *curl, struct ec2_query *q);
+int eclat_send_request(CURL *curl, struct ec2_request *q);
char *eclat_get_instance_zone(void);
@@ -232,3 +232,3 @@ void translate_ids(int argc, char **argv, const char *map);
void translate_resource_ids(int argc, char **argv);
-void eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list);
+void eclat_encode_devmap(struct ec2_request *q, struct grecs_list *list);