diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-01-22 23:59:22 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-01-23 00:03:33 +0200 |
commit | b1824338b366e25756e4c64f04e535684529832d (patch) | |
tree | 2dcbf32e0b4fb06b1c4b0a992db882ba184bbd18 | |
parent | 2beaaadb282bd4667e3af1ed65e3944960d1bd3e (diff) | |
download | eclat-b1824338b366e25756e4c64f04e535684529832d.tar.gz eclat-b1824338b366e25756e4c64f04e535684529832d.tar.bz2 |
Namespace fixup: use "request" consistently
-rw-r--r-- | lib/Makefile.am | 10 | ||||
-rw-r--r-- | lib/libeclat.h | 24 | ||||
-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.c | 56 | ||||
-rw-r--r-- | src/allocaddr.c | 2 | ||||
-rw-r--r-- | src/asscaddr.c | 12 | ||||
-rw-r--r-- | src/atvol.c | 6 | ||||
-rw-r--r-- | src/cpimg.c | 10 | ||||
-rw-r--r-- | src/cpsnap.c | 8 | ||||
-rw-r--r-- | src/deimg.c | 2 | ||||
-rw-r--r-- | src/devmap.c | 20 | ||||
-rw-r--r-- | src/devol.c | 10 | ||||
-rw-r--r-- | src/disasaddr.c | 4 | ||||
-rw-r--r-- | src/ec2map.c | 14 | ||||
-rw-r--r-- | src/eclat.c | 6 | ||||
-rw-r--r-- | src/eclat.h | 10 | ||||
-rw-r--r-- | src/getconout.c | 2 | ||||
-rw-r--r-- | src/lsaattr.c | 6 | ||||
-rw-r--r-- | src/lsaddr.c | 2 | ||||
-rw-r--r-- | src/lsiattr.c | 6 | ||||
-rw-r--r-- | src/lsimg-cl.opt | 8 | ||||
-rw-r--r-- | src/lsimg.c | 2 | ||||
-rw-r--r-- | src/lsinst.c | 2 | ||||
-rw-r--r-- | src/lsistat.c | 4 | ||||
-rw-r--r-- | src/lsreg.c | 2 | ||||
-rw-r--r-- | src/lssattr.c | 18 | ||||
-rw-r--r-- | src/lssg.c | 2 | ||||
-rw-r--r-- | src/lssnap.c | 4 | ||||
-rw-r--r-- | src/lstag.c | 6 | ||||
-rw-r--r-- | src/lsvol.c | 2 | ||||
-rw-r--r-- | src/lszon.c | 2 | ||||
-rw-r--r-- | src/mkimg.c | 10 | ||||
-rw-r--r-- | src/mkinst.c | 64 | ||||
-rw-r--r-- | src/mksg.c | 8 | ||||
-rw-r--r-- | src/mksnap.c | 4 | ||||
-rw-r--r-- | src/mktags.c | 14 | ||||
-rw-r--r-- | src/mkvol.c | 12 | ||||
-rw-r--r-- | src/rmaddr.c | 2 | ||||
-rw-r--r-- | src/rmsg.c | 4 | ||||
-rw-r--r-- | src/rmsnap.c | 4 | ||||
-rw-r--r-- | src/rmvol.c | 4 | ||||
-rw-r--r-- | src/setaattr.c | 10 | ||||
-rw-r--r-- | src/setiattr.c | 14 | ||||
-rw-r--r-- | src/sg-cl.opt | 6 | ||||
-rw-r--r-- | src/sg.c | 18 | ||||
-rw-r--r-- | src/startstop.c | 4 | ||||
-rw-r--r-- | src/util.c | 26 |
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 @@ -51,17 +51,17 @@ libeclat_a_SOURCES=\ getyn.c\ hmac_sha1.c\ hmac_sha256.c\ 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\ sha256.c\ sha256.h\ trace.c\ diff --git a/lib/libeclat.h b/lib/libeclat.h index edd26eb..a5c8c79 100644 --- a/lib/libeclat.h +++ b/lib/libeclat.h @@ -82,43 +82,43 @@ struct ec2_param { char *value; int encoded; }; #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 */ struct grecs_list *headers; /* Query headers */ char *region; char *access_key; char *token; 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; eclat_partial_tree_t eclat_partial_tree_create(void); void eclat_partial_tree_destroy(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 @@ -40,28 +40,28 @@ add_param(void *sym, void *data) } return 0; } 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; struct param_closure pc; 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 { grecs_txtacc_grow_char(acc, '?'); } diff --git a/lib/qaddparm.c b/lib/reqaddparm.c index 7328534..916bf92 100644 --- a/lib/qaddparm.c +++ b/lib/reqaddparm.c @@ -17,43 +17,44 @@ #include <config.h> #include <string.h> #include "libeclat.h" #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; p->encoded = encoded; } 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); } static void free_header(void *data) { @@ -61,19 +62,20 @@ free_header(void *data) free(p->name); free(p->value); free(p); } 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); if (value) { int len; @@ -84,8 +86,8 @@ eclat_query_add_header(struct ec2_query *q, const char *name, const char *value) --len; ent->value = grecs_malloc(len + 1); memcpy(ent->value, value, len); 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 @@ -24,28 +24,28 @@ ec2_param_free(void *ptr) struct ec2_param *p = ptr; free(p->name); free(p->value); 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 @@ -32,11 +32,11 @@ encode_param(void *sym, void *data) p->encoded = 1; } return 0; } 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 @@ -16,14 +16,14 @@ #include <config.h> #include "libeclat.h" #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 @@ -41,13 +41,13 @@ compnames(const void *a, const void *b) char * const *ac = a; char * const *bc = b; return strcmp(*ac, *bc); } static void -querysign2(struct ec2_query *req, char *secret) +requestsign2(struct ec2_request *req, char *secret) { char **pnames; size_t i, n; struct grecs_txtacc *acc; struct pname pn; char *str; @@ -58,41 +58,41 @@ querysign2(struct ec2_query *req, char *secret) char tsbuf[22]; time_t t; 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); pnames = grecs_calloc(n, sizeof(pnames[0])); pn.i = 0; pn.a = pnames; 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); 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; key.name = pnames[i]; p = grecs_symtab_lookup_or_install(req->params, &key, NULL); if (!p) @@ -109,22 +109,22 @@ querysign2(struct ec2_query *req, char *secret) str = grecs_txtacc_finish(acc, 0); hmac_sha256(str, strlen(str), secret, strlen(secret), digest); 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); free(pnames); /*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); */ } void eclat_hex_encode(unsigned char *input, size_t inlen, char **poutput, size_t *poutlen) @@ -145,13 +145,13 @@ eclat_hex_encode(unsigned char *input, size_t inlen, *p = 0; } /* 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; size_t i, n; struct grecs_txtacc *acc; char digest[SHA256_DIGEST_SIZE]; @@ -193,33 +193,33 @@ querysign4(struct ec2_query *req, char *secret) grecs_txtacc_grow(acc, service, service_len); grecs_txtacc_grow_char(acc, '/'); grecs_txtacc_grow_string(acc, termstr); 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); pnames = grecs_calloc(n, sizeof(pnames[0])); pn.i = 0; pn.a = pnames; grecs_symtab_enumerate(req->params, get_param_name, &pn); 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; key.name = pnames[i]; p = grecs_symtab_lookup_or_install(req->params, &key, NULL); if (!p) @@ -248,14 +248,14 @@ querysign4(struct ec2_query *req, char *secret) /* end of headers */ grecs_txtacc_grow_char(acc, '\n'); /* Signed Headers */ 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 payload = ""; sha256_init_ctx(&ctx); @@ -316,46 +316,46 @@ querysign4(struct ec2_query *req, char *secret) digest, sizeof(digest), digest); eclat_hex_encode((unsigned char *)digest, sizeof(digest), &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); grecs_txtacc_grow_string(acc, " Credential="); grecs_txtacc_grow_string(acc, credential); grecs_txtacc_grow_string(acc, ", SignedHeaders="); grecs_txtacc_grow_string(acc, signed_headers); grecs_txtacc_grow_string(acc, ", Signature="); 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; for (qs = qstab; qs->qs_version && strcmp(qs->qs_version, version); qs++) ; diff --git a/src/allocaddr.c b/src/allocaddr.c index 9d8d6d8..b6cf133 100644 --- a/src/allocaddr.c +++ b/src/allocaddr.c @@ -28,9 +28,9 @@ eclat_allocate_address(eclat_command_env_t *env, int argc, char **argv) argv += i; if (argc != 0) 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 @@ -31,24 +31,24 @@ eclat_associate_address(eclat_command_env_t *env, int argc, char **argv) argv += i; if (argc != 2) 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 @@ -32,12 +32,12 @@ eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv) if (argc != 3) die(EX_USAGE, "bad number of arguments"); 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 @@ -17,17 +17,17 @@ #include "eclat.h" #include "cpimg-cl.h" 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 @@ -17,16 +17,16 @@ #include "eclat.h" #include "cpsnap-cl.h" 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 @@ -27,10 +27,10 @@ eclat_deregister_image(eclat_command_env_t *env, int argc, char **argv) argc -= i; if (argc != 1) 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 @@ -23,13 +23,13 @@ isnumstr(const char *p) if (!isdigit(*p)) return 0; return 1; } 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; size_t bufsize = 0; struct grecs_list_entry *ep; @@ -43,24 +43,24 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list) die(EX_USAGE, "malformed device mapping: %s", dev); *p++ = 0; 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; /* [snapshot-id]:[v |