From f776a818f44503a79bf7fa25aedb4ae830870119 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Sat, 22 Aug 2020 12:02:23 +0800
Subject: [PATCH] correct old_value in the log info

---
 HISTORY           |  2 +-
 src/shared_func.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 42087ca..d85dc5c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,5 @@
 
-Version 1.44  2020-08-05
+Version 1.44  2020-08-22
   * add test file src/tests/test_pthread_lock.c
   * add uniq_skiplist.[hc]
   * add function split_string_ex
diff --git a/src/shared_func.c b/src/shared_func.c
index b19f152..2eba4af 100644
--- a/src/shared_func.c
+++ b/src/shared_func.c
@@ -1499,22 +1499,24 @@ int fd_gets(int fd, char *buff, const int size, int once_bytes)
 int set_rlimit(int resource, const rlim_t value)
 {
 	struct rlimit limit;
+    int64_t old_value;
 
 	if (getrlimit(resource, &limit) != 0)
 	{
-		logError("file: "__FILE__", line: %d, " \
-			"call getrlimit fail, resource=%d, " \
-			"errno: %d, error info: %s", \
+		logError("file: "__FILE__", line: %d, "
+			"call getrlimit fail, resource=%d, "
+			"errno: %d, error info: %s",
 			__LINE__, resource, errno, STRERROR(errno));
 		return errno != 0 ? errno : EPERM;
 	}
 
-	if (limit.rlim_cur == RLIM_INFINITY || \
+	if (limit.rlim_cur == RLIM_INFINITY ||
             (value != RLIM_INFINITY && limit.rlim_cur >= value))
 	{
 		return 0;
 	}
 
+    old_value = limit.rlim_cur;
 	limit.rlim_cur = value;
 	if (setrlimit(resource, &limit) != 0)
 	{
@@ -1562,8 +1564,7 @@ int set_rlimit(int resource, const rlim_t value)
 			"call setrlimit fail, resource=%d (%s), "
             "old value=%"PRId64", new value=%"PRId64", "
 			"errno: %d, error info: %s", __LINE__, resource, label,
-            (int64_t)limit.rlim_cur, (int64_t)value,
-			errno, STRERROR(errno));
+            old_value, (int64_t)value, errno, STRERROR(errno));
 		return errno != 0 ? errno : EPERM;
 	}