From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/bus_error.cpp | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/bus_error.cpp b/src/bus_error.cpp
index cf16cf2..913a771 100644
--- a/src/bus_error.cpp
+++ b/src/bus_error.cpp
@@ -11,12 +11,16 @@
static pthread_key_t strerrorKey;
-static char *_bus_errlist[_bus_nerr] = {
+static const 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",
+ "Service stoped",
+ "Exceed resource limit"
};
@@ -42,9 +46,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 +68,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