From dc4e3e7d3d0ece7e4f9b0fd5e05c2e1528db4160 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Kou=C5=99il?= <kouril@ics.muni.cz>
Date: Thu, 9 Jun 2011 10:30:59 +0000
Subject: [PATCH] Polishing of error messages

---
 org.glite.px.proxyrenewal/src/api.c    | 17 +++++++++--------
 org.glite.px.proxyrenewal/src/common.c | 25 -------------------------
 org.glite.px.proxyrenewal/src/renewd.c | 14 +++++++-------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/org.glite.px.proxyrenewal/src/api.c b/org.glite.px.proxyrenewal/src/api.c
index ac092c8..9e254ed 100644
--- a/org.glite.px.proxyrenewal/src/api.c
+++ b/org.glite.px.proxyrenewal/src/api.c
@@ -495,8 +495,8 @@ edg_wlpr_GetStatus(const char *filename, char **info)
 static const char* const errTexts[] = {
    "Unexpected EOF from peer",
    "Generic error",
-   "Protocol parse error",
-   "Compulsory element not found in message",
+   "Cannot parse protocol messages",
+   "Obligatory element not found in message",
    "Unknown protocol command",
    "SSL error",
    "Error from Myproxy server",
@@ -510,12 +510,13 @@ static const char* const errTexts[] = {
 const char *
 edg_wlpr_GetErrorText(int code)
 {
-   return code ?
-           (code <= EDG_WLPR_ERROR_BASE ?
-	            strerror(code) :
-		    errTexts[code - EDG_WLPR_ERROR_BASE - 1]
-	   ) :
-	   NULL;
+    if (code == 0)
+	return "No error";
+    if (code <= EDG_WLPR_ERROR_BASE)
+	return strerror(code);
+    if (code == EDG_WLPR_ERROR_ERRNO)
+	return strerror(errno);
+    return errTexts[code - EDG_WLPR_ERROR_BASE - 1];
 }
 
 int
diff --git a/org.glite.px.proxyrenewal/src/common.c b/org.glite.px.proxyrenewal/src/common.c
index 4121a10..1b1463c 100644
--- a/org.glite.px.proxyrenewal/src/common.c
+++ b/org.glite.px.proxyrenewal/src/common.c
@@ -20,21 +20,6 @@
 
 #ident "$Header$"
 
-static const char * const ErrorMsgs[] = {
-    "Connection closed unexpectedly",
-    "Generic error",
-    "Cannot parse protocol messages",
-    "Obligatory item not found in message",
-    "Unkown command",
-    "SSL error",
-    "MyProxy error",
-    "Proxy not registered",
-    "Proxy expired",
-    "VOMS error",
-    "Operation timed out",
-    "System error",
-};
-
 /* nread() and nwrite() never return partial data */
 static int
 nread(int sock, struct timeval *to, char *buf, size_t buf_len, size_t *read_len)
@@ -318,16 +303,6 @@ edg_wlpr_CleanResponse(edg_wlpr_Response *response)
    memset(response, 0, sizeof(*response));
 }
 
-const char *
-edg_wlpr_GetErrorString(int code)
-{
-    if (code == 0)
-	return "No error";
-    if (code <= EDG_WLPR_ERROR_BASE)
-	return strerror(code);
-    return ErrorMsgs[code - EDG_WLPR_ERROR_BASE - 1];
-}
-
 char *
 edg_wlpr_EncodeInt(int num) /* long? time */
 {
diff --git a/org.glite.px.proxyrenewal/src/renewd.c b/org.glite.px.proxyrenewal/src/renewd.c
index d52ee1d..7fc6e03 100644
--- a/org.glite.px.proxyrenewal/src/renewd.c
+++ b/org.glite.px.proxyrenewal/src/renewd.c
@@ -144,7 +144,7 @@ proto(glite_renewal_core_context ctx, int sock)
    ret = edg_wlpr_Read(sock, &timeout, &buf, &buf_len);
    if (ret) {
       edg_wlpr_Log(ctx, LOG_ERR, "Error reading from client: %s",
-                   edg_wlpr_GetErrorString(ret));
+                   edg_wlpr_GetErrorText(ret));
       return ret;
    }
 
@@ -172,7 +172,7 @@ proto(glite_renewal_core_context ctx, int sock)
    free(buf);
    if (ret) {
       edg_wlpr_Log(ctx, LOG_ERR, "Error sending response to client: %s",
-                   edg_wlpr_GetErrorString(ret));
+                   edg_wlpr_GetErrorText(ret));
       goto end;
    }
 
@@ -252,7 +252,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
 	 		   0, &request->version);
    if (ret) {
       edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading protocol specification: %s",
-                   edg_wlpr_GetErrorString(ret));
+                   edg_wlpr_GetErrorText(ret));
       return ret;
    }
    
@@ -260,7 +260,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
 	 		   0, &value);
    if (ret) {
       edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading command specification: %s",
-                   edg_wlpr_GetErrorString(ret));
+                   edg_wlpr_GetErrorText(ret));
       goto err;
    }
 
@@ -283,7 +283,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
 	 		   SEPARATORS, 0, &request->myproxy_server);
    if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
       edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading myproxy server specification: %s",
-                   edg_wlpr_GetErrorString(ret));
+                   edg_wlpr_GetErrorText(ret));
       goto err;
    }
 
@@ -300,7 +300,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
 	 		   0, &request->proxy_filename);
    if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
       edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading proxy specification: %s",
-                   edg_wlpr_GetErrorString(ret));
+                   edg_wlpr_GetErrorText(ret));
       goto err;
    }
 
@@ -318,7 +318,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
 	 		   0, &request->jobid);
    if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
       edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading JobId : %s",
-	    	   edg_wlpr_GetErrorString(ret));
+	    	   edg_wlpr_GetErrorText(ret));
       goto err;
    }
 
-- 
1.8.2.3