Commit 2ff98a81 authored by Philip Carns's avatar Philip Carns
Browse files

fix misc warnings

parent d62aac2b
...@@ -35,11 +35,11 @@ int mobject_store_aio_wait_for_complete(mobject_store_completion_t c) ...@@ -35,11 +35,11 @@ int mobject_store_aio_wait_for_complete(mobject_store_completion_t c)
return -1; return -1;
} }
MOBJECT_ASSERT(c->request != MARGO_REQUEST_NULL, "Invalid completion handle"); MOBJECT_ASSERT(c->request != MOBJECT_REQUEST_NULL, "Invalid completion handle");
int ret; int ret;
int r = mobject_aio_wait(c->request, &ret); int r = mobject_aio_wait(c->request, &ret);
c->ret_value = ret; c->ret_value = ret;
c->request = MARGO_REQUEST_NULL; c->request = MOBJECT_REQUEST_NULL;
if(c->cb_safe) if(c->cb_safe)
(c->cb_safe)(c, c->cb_arg); (c->cb_safe)(c, c->cb_arg);
...@@ -79,7 +79,7 @@ int mobject_store_aio_get_return_value(mobject_store_completion_t c) ...@@ -79,7 +79,7 @@ int mobject_store_aio_get_return_value(mobject_store_completion_t c)
void mobject_store_aio_release(mobject_store_completion_t c) void mobject_store_aio_release(mobject_store_completion_t c)
{ {
if(c == MOBJECT_COMPLETION_NULL) return; if(c == MOBJECT_COMPLETION_NULL) return;
MOBJECT_ASSERT(c->request == MARGO_REQUEST_NULL, MOBJECT_ASSERT(c->request == MOBJECT_REQUEST_NULL,
"Trying to release a completion handle before operation completed (will lead to memory leaks)"); "Trying to release a completion handle before operation completed (will lead to memory leaks)");
free(c); free(c);
} }
...@@ -81,7 +81,7 @@ int mobject_client_finalize(mobject_client_t client) ...@@ -81,7 +81,7 @@ int mobject_client_finalize(mobject_client_t client)
{ {
if(client->num_provider_handles != 0) { if(client->num_provider_handles != 0) {
fprintf(stderr, fprintf(stderr,
"[MOBJECT] Warning: %d provider handles not released before mobject_client_finalize was called\n", "[MOBJECT] Warning: %lu provider handles not released before mobject_client_finalize was called\n",
client->num_provider_handles); client->num_provider_handles);
} }
free(client->client_addr); free(client->client_addr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment