Standardize names, modulo style, with JS.

This commit is contained in:
Ian Gulliver
2015-06-06 14:59:08 -07:00
parent b66b7cc083
commit 897e13010d
3 changed files with 8 additions and 8 deletions

View File

@@ -226,7 +226,7 @@ static json_t *cosmo_command(const char *name, const json_t *arguments) {
// Public interface below // Public interface below
void cosmo_generate_uuid(char *uuid) { void cosmo_uuid(char *uuid) {
uuid_t uu; uuid_t uu;
uuid_generate(uu); uuid_generate(uu);
uuid_unparse_lower(uu, uuid); uuid_unparse_lower(uu, uuid);
@@ -256,7 +256,7 @@ void cosmo_subscribe(cosmo *instance, const json_t *subject, const json_int_t me
void cosmo_send_message(cosmo *instance, const json_t *subject, json_t *message) { void cosmo_send_message(cosmo *instance, const json_t *subject, json_t *message) {
char sender_message_id[COSMO_UUID_SIZE]; char sender_message_id[COSMO_UUID_SIZE];
cosmo_generate_uuid(sender_message_id); cosmo_uuid(sender_message_id);
char *encoded = json_dumps(message, JSON_ENCODE_ANY); char *encoded = json_dumps(message, JSON_ENCODE_ANY);
json_t *arguments = json_pack("{sOssss}", json_t *arguments = json_pack("{sOssss}",
"subject", subject, "subject", subject,
@@ -274,7 +274,7 @@ cosmo *cosmo_create(const char *base_url, const char *client_id) {
assert(instance); assert(instance);
strcpy(instance->client_id, client_id); strcpy(instance->client_id, client_id);
cosmo_generate_uuid(instance->instance_id); cosmo_uuid(instance->instance_id);
assert(!pthread_mutex_init(&instance->lock, NULL)); assert(!pthread_mutex_init(&instance->lock, NULL));
assert(!pthread_cond_init(&instance->cond, NULL)); assert(!pthread_cond_init(&instance->cond, NULL));
@@ -300,7 +300,7 @@ cosmo *cosmo_create(const char *base_url, const char *client_id) {
return instance; return instance;
} }
void cosmo_destroy(cosmo *instance) { void cosmo_shutdown(cosmo *instance) {
pthread_mutex_lock(&instance->lock); pthread_mutex_lock(&instance->lock);
instance->shutdown = 1; instance->shutdown = 1;
instance->next_delay_ms = 0; instance->next_delay_ms = 0;

View File

@@ -22,10 +22,10 @@ typedef struct {
CURL *curl; CURL *curl;
} cosmo; } cosmo;
void cosmo_generate_uuid(char *uuid); void cosmo_uuid(char *uuid);
cosmo *cosmo_create(const char *base_url, const char *client_id); cosmo *cosmo_create(const char *base_url, const char *client_id);
void cosmo_destroy(cosmo *instance); void cosmo_shutdown(cosmo *instance);
json_t *cosmo_subject(const char *name, const char *readable_only_by, const char *writeable_only_by); json_t *cosmo_subject(const char *name, const char *readable_only_by, const char *writeable_only_by);
void cosmo_subscribe(cosmo *instance, const json_t *subject, const json_int_t messages, const json_int_t last_id); void cosmo_subscribe(cosmo *instance, const json_t *subject, const json_int_t messages, const json_int_t last_id);

View File

@@ -4,7 +4,7 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
char client_id[COSMO_UUID_SIZE]; char client_id[COSMO_UUID_SIZE];
cosmo_generate_uuid(client_id); cosmo_uuid(client_id);
cosmo *instance = cosmo_create("https://playground.cosmopolite.org/cosmopolite", client_id); cosmo *instance = cosmo_create("https://playground.cosmopolite.org/cosmopolite", client_id);
json_t *subject = cosmo_subject("foobar", NULL, NULL); json_t *subject = cosmo_subject("foobar", NULL, NULL);
cosmo_subscribe(instance, subject, -1, 0); cosmo_subscribe(instance, subject, -1, 0);
@@ -13,7 +13,7 @@ int main(int argc, char *argv[]) {
json_decref(message); json_decref(message);
json_decref(subject); json_decref(subject);
sleep(120); sleep(120);
cosmo_destroy(instance); cosmo_shutdown(instance);
return 0; return 0;
} }