From 374de95f8c2f42a07fbb8a1119449f25bdbda12e Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Wed, 3 Apr 2013 10:50:34 +0300 Subject: [PATCH] resource-asm: fixed string formats, error case handling. --- src/plugins/resource-asm/asm-bridge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/resource-asm/asm-bridge.c b/src/plugins/resource-asm/asm-bridge.c index 212bcc8..ffba630 100644 --- a/src/plugins/resource-asm/asm-bridge.c +++ b/src/plugins/resource-asm/asm-bridge.c @@ -277,7 +277,7 @@ static int send_callback_to_client(asm_to_lib_cb_t *msg, ctx_t *ctx) struct watched_file *wf = NULL; - ret = snprintf(wr_filename, ASM_FILENAME_SIZE, "/tmp/ASM.%d.%u", + ret = snprintf(wr_filename, ASM_FILENAME_SIZE, "/tmp/ASM.%u.%d", msg->instance_id, msg->handle); if (ret <= 0 || ret == ASM_FILENAME_SIZE) @@ -294,7 +294,7 @@ static int send_callback_to_client(asm_to_lib_cb_t *msg, ctx_t *ctx) if (msg->callback_expected) { - ret = snprintf(rd_filename, ASM_FILENAME_SIZE, "/tmp/ASM.%d.%ur", + ret = snprintf(rd_filename, ASM_FILENAME_SIZE, "/tmp/ASM.%u.%dr", msg->instance_id, msg->handle); if (ret <= 0 || ret == ASM_FILENAME_SIZE) @@ -315,6 +315,7 @@ static int send_callback_to_client(asm_to_lib_cb_t *msg, ctx_t *ctx) log_write("client %d.%u missed a callback notification\n", msg->instance_id, msg->handle); + close(rd_fd); } else { mrp_io_event_t ev; -- 2.7.4