From feabe37f96419cea64882f924e3c827428f2e151 Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Wed, 2 Nov 2011 10:44:33 +0000 Subject: [PATCH] just c indent correction --- emi.canl.canl-c/src/canl.c | 70 ++++++++++++++++---------------- emi.canl.canl-c/src/canl.h | 4 +- emi.canl.canl-c/src/canl_sample_client.c | 24 +++++------ emi.canl.canl-c/src/canl_sample_server.c | 26 ++++++------ 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/emi.canl.canl-c/src/canl.c b/emi.canl.canl-c/src/canl.c index 7d138fa..e35718b 100644 --- a/emi.canl.canl-c/src/canl.c +++ b/emi.canl.canl-c/src/canl.c @@ -7,13 +7,13 @@ canl_ctx canl_create_ctx() { struct glb_ctx *new_ctx = NULL; int err = 0; - + /*create context*/ new_ctx = (struct glb_ctx *) malloc(sizeof(*new_ctx)); if (!new_ctx) { - err=1; //use errno instead + err=1; //use errno instead //set_error(ctx->err_msg); - goto end; + goto end; } /*openssl init. -check return value @@ -44,8 +44,8 @@ void canl_free_ctx(canl_ctx cc) /*delete content*/ if (ctx->io_ctx) { - canl_io_destroy(ctx, ctx->io_ctx); - ctx->io_ctx = NULL; + canl_io_destroy(ctx, ctx->io_ctx); + ctx->io_ctx = NULL; } if (ctx->err_msg) { @@ -66,14 +66,14 @@ canl_io_handler canl_create_io_handler(canl_ctx cc) struct io_handler *new_io_h = NULL; if (!cc) { - goto end; + goto end; } /*create io handler*/ new_io_h = (struct io_handler *) malloc(sizeof(*new_io_h)); if (!new_io_h) //set_error(ctx->err_msg); - goto end; + goto end; /*read cc and set io_handler accordingly ...*/ @@ -82,7 +82,7 @@ end: } int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, int port, - int flags, cred_handler ch, struct timeval *timeout) + int flags, cred_handler ch, struct timeval *timeout) { int err; struct io_handler *io_cc = (struct io_handler*) io; @@ -91,13 +91,13 @@ int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, int port, /*check cc and io*/ if (!cc) { err = 1; - goto end; + goto end; } if (!io) { //set_error(ctx->err_msg); - err = 1; - goto end; + err = 1; + goto end; } /*dns*/ @@ -109,16 +109,16 @@ int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, int port, /*write succes or failure to cc, io*/ //if (err) - /*cc or io set error*/ + /*cc or io set error*/ //else - /*cc or io set succes*/ + /*cc or io set succes*/ end: return err; } int canl_io_accept(canl_ctx cc, canl_io_handler io, int port, - int flags, cred_handler ch, struct timeval *timeout, - canl_io_handler *new_io) + int flags, cred_handler ch, struct timeval *timeout, + canl_io_handler *new_io) { int err; struct io_handler *io_cc = (struct io_handler*) io; @@ -127,13 +127,13 @@ int canl_io_accept(canl_ctx cc, canl_io_handler io, int port, /*check cc and io*/ if (!cc) { err = 1; - goto end; + goto end; } if (!io) { //set_error(ctx->err_msg); - err = 1; - goto end; + err = 1; + goto end; } /*check cc and io*/ @@ -143,9 +143,9 @@ int canl_io_accept(canl_ctx cc, canl_io_handler io, int port, /*write succes or failure to cc, io*/ //if (err) - /*cc or io set error*/ + /*cc or io set error*/ //else - /*cc or io set succes*/ + /*cc or io set succes*/ end: return err; @@ -158,15 +158,15 @@ int canl_io_close(canl_ctx cc, canl_io_handler io) /*check cc and io*/ if (!cc) { err = 1; - goto end; + goto end; } if (!io) { //set_error(ctx->err_msg); - err = 1; - goto end; + err = 1; + goto end; } - + /*ssl close*/ /*set cc and io accordingly*/ @@ -181,20 +181,20 @@ int canl_io_destroy(canl_ctx cc, canl_io_handler io) /*check cc and io*/ if (!cc) { err = 1; - goto end; + goto end; } if (!io) { //set_error(ctx->err_msg); - err = 1; + err = 1; } // delete io_handle content - + // delete io itself if (io) { - free (io); - io = NULL; + free (io); + io = NULL; } end: return err; @@ -205,13 +205,13 @@ size_t canl_io_read(canl_ctx cc, canl_io_handler io, void *buffer, size_t size, int err = 0; if (!cc) { err = 1; - goto end; + goto end; } if (!io) { //set_error(ctx->err_msg); - err = 1; - goto end; + err = 1; + goto end; } //read something using openssl @@ -225,13 +225,13 @@ size_t canl_io_write(canl_ctx cc, canl_io_handler io, void *buffer, size_t size, int err; if (!cc) { err = 1; - goto end; + goto end; } if (!io) { //set_error(ctx->err_msg); - err = 1; - goto end; + err = 1; + goto end; } //write sometring using openssl diff --git a/emi.canl.canl-c/src/canl.h b/emi.canl.canl-c/src/canl.h index d18cc13..80fe9c1 100644 --- a/emi.canl.canl-c/src/canl.h +++ b/emi.canl.canl-c/src/canl.h @@ -10,9 +10,9 @@ void canl_free_ctx(canl_ctx cc); canl_io_handler canl_create_io_handler(canl_ctx cc); int canl_io_connect(canl_ctx cc, canl_io_handler io, char * host, - int port, int flags, cred_handler ch, struct timeval *timeout); + int port, int flags, cred_handler ch, struct timeval *timeout); int canl_io_accept(canl_ctx cc, canl_io_handler io, int port, int flags, cred_handler ch, - struct timeval *timeout, canl_io_handler * new_io); + struct timeval *timeout, canl_io_handler * new_io); 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); diff --git a/emi.canl.canl-c/src/canl_sample_client.c b/emi.canl.canl-c/src/canl_sample_client.c index 60c2d5a..afba402 100644 --- a/emi.canl.canl-c/src/canl_sample_client.c +++ b/emi.canl.canl-c/src/canl_sample_client.c @@ -10,47 +10,47 @@ int main() my_ctx = canl_create_ctx(); if (!my_ctx){ - // set_error("context cannot be created\n"); - goto end; + // set_error("context cannot be created\n"); + goto end; } my_io_h = canl_create_io_handler(my_ctx); if (!my_io_h) { - //set_error("io handler cannot be created\n"); - goto end; + //set_error("io handler cannot be created\n"); + goto end; } err = canl_io_connect(my_ctx, my_io_h, NULL, 1234, 0, NULL, NULL); if (err) { - //set_error("cannot make a connection"); - goto end; + //set_error("cannot make a connection"); + goto end; } err = canl_io_write (my_ctx, my_io_h, NULL, 0, NULL); if (err) { - //set_error ("cannot write"); + //set_error ("cannot write"); } - + err = canl_io_read (my_ctx, my_io_h, NULL, 0, NULL); if (err) { - //set_error ("cannot read"); + //set_error ("cannot read"); } err = canl_io_close(my_ctx, my_io_h); if (err){ - //set_error ("cannot close io"); + //set_error ("cannot close io"); } err = canl_io_destroy(my_ctx, my_io_h); if (err){ - //set_error ("cannot destroy io"); + //set_error ("cannot destroy io"); } end: canl_io_get_error(my_ctx, &err_msg); if (err_msg != NULL) printf("%s\n", err_msg); - + canl_free_ctx(my_ctx); return err; diff --git a/emi.canl.canl-c/src/canl_sample_server.c b/emi.canl.canl-c/src/canl_sample_server.c index 482b263..1609daf 100644 --- a/emi.canl.canl-c/src/canl_sample_server.c +++ b/emi.canl.canl-c/src/canl_sample_server.c @@ -10,14 +10,14 @@ int main() my_ctx = canl_create_ctx(); if (!my_ctx){ - // set_error("context cannot be created\n"); - goto end; + // set_error("context cannot be created\n"); + goto end; } my_io_h = canl_create_io_handler(my_ctx); if (!my_io_h) { - //set_error("io handler cannot be created\n"); - goto end; + //set_error("io handler cannot be created\n"); + goto end; } err = canl_io_accept(my_ctx, my_io_h, 1234, 0, NULL, NULL, NULL); @@ -28,36 +28,36 @@ int main() err = canl_io_connect(my_ctx, my_io_h, NULL, 1234, 0, NULL, NULL); if (err) { - //set_error("cannot make a connection"); - canl_io_destroy(my_ctx, my_io_h); - goto end; + //set_error("cannot make a connection"); + canl_io_destroy(my_ctx, my_io_h); + goto end; } err = canl_io_write (my_ctx, my_io_h, NULL, 0, NULL); if (err) { - //set_error ("cannot write"); + //set_error ("cannot write"); } - + err = canl_io_read (my_ctx, my_io_h, NULL, 0, NULL); if (err) { - //set_error ("cannot read"); + //set_error ("cannot read"); } err = canl_io_close(my_ctx, my_io_h); if (err){ - //set_error ("cannot close io"); + //set_error ("cannot close io"); } err = canl_io_destroy(my_ctx, my_io_h); if (err){ - //set_error ("cannot destroy io"); + //set_error ("cannot destroy io"); } end: canl_io_get_error(my_ctx, &err_msg); if (err_msg != NULL) printf("%s\n", err_msg); - + canl_free_ctx(my_ctx); return err; -- 1.8.2.3