Minor fixes.

This commit is contained in:
Ian Gulliver
2015-06-14 00:21:32 +00:00
parent 71a972688c
commit 43b59c713a

View File

@@ -148,7 +148,7 @@ static void cosmo_handle_message(cosmo *instance, json_t *event) {
} }
json_error_t err; json_error_t err;
json_t *message_object = json_loads(json_string_value(message_content), 0, &err); json_t *message_object = json_loads(json_string_value(message_content), JSON_DECODE_ANY, &err);
if (!message_object) { if (!message_object) {
fprintf(stderr, "error parsing message content: %s\n", err.text); fprintf(stderr, "error parsing message content: %s\n", err.text);
return; return;
@@ -310,8 +310,7 @@ static void *cosmo_thread_main(void *arg) {
ts.tv_sec = tv.tv_sec + (instance->next_delay_ms / 1000); ts.tv_sec = tv.tv_sec + (instance->next_delay_ms / 1000);
} }
int wait = pthread_cond_timedwait(&instance->cond, &instance->lock, &ts); pthread_cond_timedwait(&instance->cond, &instance->lock, &ts);
assert(wait == 0 || wait == ETIMEDOUT);
} else { } else {
assert(!pthread_cond_wait(&instance->cond, &instance->lock)); assert(!pthread_cond_wait(&instance->cond, &instance->lock));
} }