From: Daniel KouĊ™il Date: Tue, 6 Dec 2011 14:09:40 +0000 (+0000) Subject: canl_get_error_code() and canl_get_error_message() added X-Git-Tag: merge_30_head_take2_after~30 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=0727b06451c5b8a3db073d1bc37f030ee99df2eb;p=jra1mw.git canl_get_error_code() and canl_get_error_message() added --- diff --git a/emi.canl.canl-c/src/canl.h b/emi.canl.canl-c/src/canl.h index 4248a8b..f79d3c2 100644 --- a/emi.canl.canl-c/src/canl.h +++ b/emi.canl.canl-c/src/canl.h @@ -23,7 +23,12 @@ int canl_io_accept(canl_ctx cc, canl_io_handler io, int port, int flags, cred_ha size_t canl_io_read(canl_ctx cc, canl_io_handler io, void *buffer, size_t size, struct timeval *timeout); size_t canl_io_write(canl_ctx cc, canl_io_handler io, void *buffer, size_t size, struct timeval *timeout); -int canl_get_error(canl_ctx cc, char ** reason); +int +canl_get_error_code(canl_ctx cc); + +char * +canl_get_error_message(canl_ctx); + int canl_io_close(canl_ctx cc, canl_io_handler io); int canl_io_destroy(canl_ctx cc, canl_io_handler io); diff --git a/emi.canl.canl-c/src/canl_err.c b/emi.canl.canl-c/src/canl_err.c index f2318d9..2b21762 100644 --- a/emi.canl.canl-c/src/canl_err.c +++ b/emi.canl.canl-c/src/canl_err.c @@ -173,6 +173,28 @@ static void get_error_string(glb_ctx *cc, char *code_str) } } +unsigned long +canl_get_error_code(canl_ctx cc) +{ + glb_ctx *ctx = (glb_ctx*) cc; + + if (ctx == NULL) + return -1; + + return ctx->err_code; +} + +char * +canl_get_error_message(canl_ctx) +{ + glb_ctx *ctx = (glb_ctx*) cc; + + if (ctx == NULL || ctx->err_msg == NULL) + return "No error available"; + + return ctx->err_msg; +} + /*if the error code is known to colin, assign appropriate colin code TODO go through ssl errors and assign appr. colin code ?preserve original one? */