From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Thu, 19 Jan 2012 08:25:51 +0000 (+0000)
Subject: A small rename to stay consistent with other names
X-Git-Tag: emi-canl-c_R_1_0_0_0~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=04777d22482de70bd1369571e07babf73ad60f6c;p=jra1mw.git

A small rename to stay consistent with other names
---

diff --git a/emi.canl.canl-c/src/canl_err.c b/emi.canl.canl-c/src/canl_err.c
index 6957ac0..1036874 100644
--- a/emi.canl.canl-c/src/canl_err.c
+++ b/emi.canl.canl-c/src/canl_err.c
@@ -3,14 +3,14 @@
 #define ERR_CODE_LEN 512
 
 static canl_err_code resolve_error(glb_ctx *cc, unsigned long err_code, 
-        canl_error_origin err_orig);
+        canl_err_origin err_orig);
 static void get_error_string(glb_ctx *cc, char *code_str);
 
 /* TODO: produce error messages immediately (to chain them) */
 /* Save error message into err_msg
  * use NULL for empty err_format */
 canl_err_code update_error (glb_ctx *cc, unsigned long err_code,
-		  canl_error_origin err_orig,
+		  canl_err_origin err_orig,
 		  const char *err_format, ...)
 {
     unsigned int err_msg_len = 0;
@@ -60,7 +60,7 @@ canl_err_code update_error (glb_ctx *cc, unsigned long err_code,
 
 /* If there was some error message in ctx, delete it and make new */
 canl_err_code set_error (glb_ctx *cc, unsigned long err_code,
-	canl_error_origin err_orig,
+	canl_err_origin err_orig,
         const char *err_format, ...)
 {
     va_list ap;
@@ -214,7 +214,7 @@ canl_get_error_message(canl_ctx cc)
   TODO go through ssl errors and assign appr. canl code
   ?preserve original one? */
 static canl_err_code resolve_error(glb_ctx *cc, unsigned long err_code, 
-        canl_error_origin err_orig)
+        canl_err_origin err_orig)
 {
     if (err_orig == CANL_ERROR) {
         cc->err_code = err_code;
diff --git a/emi.canl.canl-c/src/canl_locl.h b/emi.canl.canl-c/src/canl_locl.h
index ed04b7c..85eba86 100644
--- a/emi.canl.canl-c/src/canl_locl.h
+++ b/emi.canl.canl-c/src/canl_locl.h
@@ -34,13 +34,13 @@ typedef struct canl_err_desc {
     unsigned long openssl_reason;
 } canl_err_desc;
 
-typedef enum canl_error_origin {
+typedef enum canl_err_origin {
     UNKNOWN_ERROR = 0,
     POSIX_ERROR,
     SSL_ERROR,
     CANL_ERROR,
     NETDB_ERROR,
-} canl_error_origin;
+} canl_err_origin;
 
 typedef enum _CANL_AUTH_MECHANISM
 {
@@ -60,7 +60,7 @@ typedef struct _glb_ctx
 {
     char * err_msg;
     canl_err_code err_code;
-    canl_error_origin err_orig;
+    canl_err_origin err_orig;
     cert_key_store *cert_key;
 } glb_ctx;
 
@@ -128,9 +128,9 @@ extern struct canl_mech canl_mech_ssl;
 
 void reset_error (glb_ctx *cc, unsigned long err_code);
 canl_err_code set_error (glb_ctx *cc, unsigned long err_code,
-	canl_error_origin err_orig, const char *err_format, ...);
+	canl_err_origin err_orig, const char *err_format, ...);
 canl_err_code update_error (glb_ctx *cc, unsigned long err_code,
-	canl_error_origin err_orig, const char *err_format, ...);
+	canl_err_origin err_orig, const char *err_format, ...);
 void free_hostent(struct hostent *h); //TODO is there some standard funcion to free hostent?
 int asyn_getservbyname(int a_family, asyn_result *ares_result,char const *name, 
         struct timeval *timeout);
diff --git a/emi.canl.canl-c/src/canl_ssl.c b/emi.canl.canl-c/src/canl_ssl.c
index b11d017..9e36c91 100644
--- a/emi.canl.canl-c/src/canl_ssl.c
+++ b/emi.canl.canl-c/src/canl_ssl.c
@@ -432,7 +432,7 @@ static int do_ssl_connect(glb_ctx *cc, io_handler *io,
     int ret = -1, ret2 = -1;
     unsigned long ssl_err = 0;
     int err = 0;
-    canl_error_origin e_orig = UNKNOWN_ERROR;
+    canl_err_origin e_orig = UNKNOWN_ERROR;
     long errorcode = 0;
     int expected = 0;
     int locl_timeout = -1;
@@ -486,7 +486,7 @@ static int do_ssl_accept(glb_ctx *cc, io_handler *io,
     int ret = -1, ret2 = -1;
     unsigned long ssl_err = 0;
     int err = 0;
-    canl_error_origin e_orig = UNKNOWN_ERROR;
+    canl_err_origin e_orig = UNKNOWN_ERROR;
     long errorcode = 0;
     int expected = 0;
     int locl_timeout = -1;