aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
@@ -54,11 +54,11 @@ libeclat_a_SOURCES=\
libeclat.h\
map.c\
path.c\
- q2url.c\
- qaddparm.c\
- qcreat.c\
- qencode.c\
- qfree.c\
+ req2url.c\
+ reqaddparm.c\
+ reqcreat.c\
+ reqencode.c\
+ reqfree.c\
reqsign.c\
sha1.c\
sha1.h\
diff --git a/lib/libeclat.h b/lib/libeclat.h
index edd26eb..a5c8c79 100644
--- a/lib/libeclat.h
+++ b/lib/libeclat.h
@@ -85,11 +85,11 @@ struct ec2_param {
#define EC2_API_VERSION "2013-02-01"
-#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 */
char *uri; /* URI without parameters */
struct grecs_symtab *params; /* Query parameters */
@@ -100,22 +100,22 @@ struct ec2_query {
unsigned long ttl; /* Time-to-live in seconds */
};
-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);
typedef struct eclat_partial_tree *eclat_partial_tree_t;
diff --git a/lib/q2url.c b/lib/req2url.c
index 6404f33..25277a2 100644
--- a/lib/q2url.c
+++ b/lib/req2url.c
@@ -43,7 +43,7 @@ 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)
{
struct grecs_txtacc *acc;
char *ret = NULL, *p;
@@ -52,13 +52,13 @@ eclat_query_to_url(struct ec2_query *req, char **post_params)
acc = grecs_txtacc_create();
grecs_txtacc_grow(acc, "http", 4);
- if (req->flags & EC2_QF_HTTPS)
+ if (req->flags & EC2_RF_HTTPS)
grecs_txtacc_grow_char(acc, 's');
grecs_txtacc_grow(acc, "://", 3);
grecs_txtacc_grow(acc, req->endpoint, strlen(req->endpoint));
grecs_txtacc_grow(acc, req->uri, strlen(req->uri));
- if (req->flags & EC2_QF_POST) {
+ if (req->flags & EC2_RF_POST) {
grecs_txtacc_grow_char(acc, 0);
ret = grecs_txtacc_finish(acc, 1);
} else {
diff --git a/lib/qaddparm.c b/lib/reqaddparm.c
index 7328534..916bf92 100644
--- a/lib/qaddparm.c
+++ b/lib/reqaddparm.c
@@ -20,14 +20,14 @@
#include "grecs.h"
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)
{
struct ec2_param *p, key;
int install = 1;
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)
free(p->value);
p->value = value ? grecs_strdup(value) : NULL;
@@ -35,22 +35,23 @@ 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);
}
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)
{
if (value) {
char *str;
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);
}
@@ -64,13 +65,14 @@ 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)
{
struct ec2_param *ent;
- 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;
}
ent = grecs_malloc(sizeof(*ent));
ent->name = grecs_strdup(name);
@@ -87,5 +89,5 @@ eclat_query_add_header(struct ec2_query *q, const char *name, const char *value)
ent->value[len] = 0;
} else
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
@@ -27,25 +27,25 @@ ec2_param_free(void *ptr)
free(p);
}
-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,
char const *token)
{
- 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,
NULL,
NULL,
NULL,
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
@@ -35,8 +35,8 @@ 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
@@ -19,11 +19,11 @@
#include "grecs.h"
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
@@ -44,7 +44,7 @@ compnames(const void *a, const void *b)
}
static void
-querysign2(struct ec2_query *req, char *secret)
+requestsign2(struct ec2_request *req, char *secret)
{
char **pnames;
size_t i, n;
@@ -61,17 +61,17 @@ querysign2(struct ec2_query *req, char *secret)
acc = grecs_txtacc_create();
/* 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);
time(&t);
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);
/* Collect and sort parameter names */
n = grecs_symtab_count_entries(req->params);
@@ -81,7 +81,7 @@ querysign2(struct ec2_query *req, char *secret)
grecs_symtab_enumerate(req->params, get_param_name, &pn);
qsort(pnames, n, sizeof(pnames[0]), compnames);
- verb = (req->flags & EC2_QF_POST) ? "POST" : "GET";
+ verb = (req->flags & EC2_RF_POST) ? "POST" : "GET";
grecs_txtacc_grow_string(acc, verb);
grecs_txtacc_grow_char(acc, '\n');
grecs_txtacc_grow_string(acc, req->endpoint);
@@ -89,7 +89,7 @@ querysign2(struct ec2_query *req, char *secret)
grecs_txtacc_grow_string(acc, req->uri);
grecs_txtacc_grow_char(acc, '\n');
- /* Append a canonicalized query string */
+ /* Append a canonicalized request string */
for (i = 0; i < n; i++) {
struct ec2_param *p, key;
@@ -112,7 +112,7 @@ querysign2(struct ec2_query *req, char *secret)
eclat_base64_encode((unsigned char *)digest, sizeof(digest),
(unsigned char**) &signature, &siglen);
- eclat_query_add_param_encoded(req, "Signature", signature);
+ eclat_request_add_param_encoded(req, "Signature", signature);
free(signature);
grecs_txtacc_free(acc);
@@ -121,7 +121,7 @@ querysign2(struct ec2_query *req, char *secret)
/*FIXME
t += req->ttl;
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);
*/
}
@@ -148,7 +148,7 @@ eclat_hex_encode(unsigned char *input, size_t inlen,
/* Ref. http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
*/
static void
-querysign4(struct ec2_query *req, char *secret)
+requestsign4(struct ec2_request *req, char *secret)
{
char **pnames;
struct pname pn;
@@ -196,11 +196,11 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_char(acc, 0);
credential = grecs_txtacc_finish(acc, 0);
- 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);
/* Collect and sort parameter names */
n = grecs_symtab_count_entries(req->params);
@@ -211,12 +211,12 @@ querysign4(struct ec2_query *req, char *secret)
qsort(pnames, n, sizeof(pnames[0]), compnames);
/* 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);
grecs_txtacc_grow_char(acc, '\n');
grecs_txtacc_grow_string(acc, req->uri);
grecs_txtacc_grow_char(acc, '\n');
- /* Append a canonicalized query string */
+ /* Append a canonicalized request string */
for (i = 0; i < n; i++) {
struct ec2_param *p, key;
@@ -251,8 +251,8 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_string(acc, signed_headers);
grecs_txtacc_grow_char(acc, '\n');
/* 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__);
abort();
} else
@@ -319,7 +319,7 @@ querysign4(struct ec2_query *req, char *secret)
&signature, &hashsize);
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);
/* Build authorization header */
grecs_txtacc_grow_string(acc, algostr);
@@ -331,28 +331,28 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_string(acc, signature);
grecs_txtacc_grow_char(acc, 0);
p = grecs_txtacc_finish(acc, 0);
- eclat_query_add_header(req, "Authorization", p);
+ eclat_request_add_header(req, "Authorization", p);
free(signature);
grecs_txtacc_free(acc);
- /* Encode the query */
- eclat_query_encode(req);
+ /* Encode the request */
+ eclat_request_encode(req);
}
struct qsimpl {
char *qs_version;
- void (*qs_fun)(struct ec2_query *, char *);
+ void (*qs_fun)(struct ec2_request *, char *);
};
static struct qsimpl qstab[] = {
- { "2", querysign2 },
- { "4", querysign4 },
+ { "2", requestsign2 },
+ { "4", requestsign4 },
{ NULL }
};
void
-eclat_query_sign(struct ec2_query *req, char *secret, char *version)
+eclat_request_sign(struct ec2_request *req, char *secret, char *version)
{
struct qsimpl *qs;
diff --git a/src/allocaddr.c b/src/allocaddr.c
index 9d8d6d8..b6cf133 100644
--- a/src/allocaddr.c
+++ b/src/allocaddr.c
@@ -31,6 +31,6 @@ eclat_allocate_address(eclat_command_env_t *env, int argc, char **argv)
die(EX_USAGE, "wrong number of arguments to allocate-address");
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
@@ -34,21 +34,21 @@ eclat_associate_address(eclat_command_env_t *env, int argc, char **argv)
die(EX_USAGE, "wrong number of arguments to associate-address");
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");
} else {
- eclat_query_add_param(env->query, "PublicIp", argv[1]);
+ eclat_request_add_param(env->request, "PublicIp", argv[1]);
}
return 0;
}
diff --git a/src/atvol.c b/src/atvol.c
index b07bea2..36abcb5 100644
--- a/src/atvol.c
+++ b/src/atvol.c
@@ -35,9 +35,9 @@ eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv)
translate_ids(1, argv, MAP_VOLUME);
translate_ids(1, argv + 1, MAP_INSTANCE);
- 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]);
return 0;
}
diff --git a/src/cpimg.c b/src/cpimg.c
index fa9db23..ef92ffb 100644
--- a/src/cpimg.c
+++ b/src/cpimg.c
@@ -20,14 +20,14 @@
int
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
@@ -20,13 +20,13 @@
int
eclat_copy_snapshot(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, "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
@@ -30,7 +30,7 @@ eclat_deregister_image(eclat_command_env_t *env, int argc, char **argv)
die(EX_USAGE, "bad number of arguments");
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
@@ -26,7 +26,7 @@ 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)
{
int i;
char *bufptr = NULL;
@@ -46,18 +46,18 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
grecs_asprintf(&bufptr, &bufsize,
"BlockDeviceMapping.%d.DeviceName",
i);
- eclat_query_add_param(q, bufptr, dev);
+ eclat_request_add_param(q, bufptr, dev);
if (strcmp(p, "none") == 0) {
grecs_asprintf(&bufptr, &bufsize,
"BlockDeviceMapping.%d.NoDevice",
i);
- eclat_query_add_param(q, bufptr, NULL);
+ eclat_request_add_param(q, bufptr, NULL);
} else if (strncmp(p, "ephemeral", 9) == 0) {
grecs_asprintf(&bufptr, &bufsize,
"BlockDeviceMapping.%d.VirtualName",
i);
- eclat_query_add_param(q, bufptr, p);
+ eclat_request_add_param(q, bufptr, p);
} else {
struct wordsplit ws;
@@ -95,7 +95,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
ws.ws_wordv[0]);
}
}
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[0]);
} else if (ws.ws_wordc < 2) {
die(EX_USAGE,
@@ -107,7 +107,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
"BlockDeviceMapping.%d."
"Ebs.SnapshotId",
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[0]);
}
@@ -116,7 +116,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
"BlockDeviceMapping.%d."
"Ebs.VolumeSize",
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[1]);
}
}
@@ -131,7 +131,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
grecs_asprintf(&bufptr, &bufsize,
"BlockDeviceMapping.%d.Ebs.Iops",
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[4]);
}
/* fall through */
@@ -140,7 +140,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
grecs_asprintf(&bufptr, &bufsize,
"BlockDeviceMapping.%d.Ebs.VolumeType",
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[3]);
}
/* fall through */
@@ -156,7 +156,7 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list)
"BlockDeviceMapping.%d."
"Ebs.DeleteOnTermination",
i);
- eclat_query_add_param(q, bufptr,
+ eclat_request_add_param(q, bufptr,
ws.ws_wordv[2]);
}
case 2:
diff --git a/src/devol.c b/src/devol.c
index ceda9be..76a8423 100644
--- a/src/devol.c
+++ b/src/devol.c
@@ -22,7 +22,7 @@ int
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;
parse_options(env, argc, argv, &i);
argc -= i;
@@ -33,14 +33,14 @@ eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv)
translate_ids(1, argv, MAP_VOLUME);
- 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]);
}
<