From cb85aa8a8d02a3d6dc16e3f32e78da9e70f9c7f5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 02 二月 2021 17:49:21 +0800
Subject: [PATCH] update
---
src/bus_error.cpp | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/bus_error.cpp b/src/bus_error.cpp
index cf16cf2..2c410eb 100644
--- a/src/bus_error.cpp
+++ b/src/bus_error.cpp
@@ -13,10 +13,12 @@
static char *_bus_errlist[_bus_nerr] = {
"\0",
- "Timeout",
+ "Timed out",
"The other end is not inline",
"Key already in use",
- "Network fault"
+ "Network fault",
+ "Send to self error",
+ "Receive from wrong end"
};
@@ -42,9 +44,8 @@
char *
bus_strerror(int err)
{
- int s, eindex;
+ int s;
char *buf;
- eindex = err - EBUS_BASE;
/* Make first caller allocate key for thread-specific data */
s = pthread_once(&once, createKey);
@@ -65,14 +66,31 @@
err_exit(s, "pthread_setspecific");
}
- if (eindex < 0 || eindex >= _bus_nerr || _bus_errlist[eindex] == NULL)
- {
- snprintf(buf, MAX_ERROR_LEN, "Unknown error %d", eindex);
- }
- else
- {
- strncpy(buf, _bus_errlist[eindex], MAX_ERROR_LEN - 1);
- buf[MAX_ERROR_LEN - 1] = '\0'; /* Ensure null termination */
+
+ if(err < EBUS_BASE) {
+ // libc閿欒
+ if (err < 0 || err >= _sys_nerr || _sys_errlist[err] == NULL)
+ {
+ snprintf(buf, MAX_ERROR_LEN, "Unknown error %d", err);
+ }
+ else
+ {
+ strncpy(buf, _sys_errlist[err], MAX_ERROR_LEN - 1);
+ buf[MAX_ERROR_LEN - 1] = '\0'; /* Ensure null termination */
+ }
+ } else {
+ //鑷畾涔夐敊璇�
+ err -= EBUS_BASE;
+ if (err < 0 || err >= _bus_nerr || _bus_errlist[err] == NULL)
+ {
+ snprintf(buf, MAX_ERROR_LEN, "Unknown error %d", err);
+ }
+ else
+ {
+ strncpy(buf, _bus_errlist[err], MAX_ERROR_LEN - 1);
+ buf[MAX_ERROR_LEN - 1] = '\0'; /* Ensure null termination */
+ }
+
}
return buf;
--
Gitblit v1.8.0