提交: 78cb6e9eecafecc60437394b5f36161822091fa2 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• 修订版: 78cb6e9eecafecc60437394b5f36161822091fa2 (tree)
• 时间: 2013-06-24 16:00:27
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

RHEL6.1上コンパイルエラー対処

#30993 の対処をいれると、RHEL6.1上では返り値が使われていない
というエラーが出るため、対処。

Signed-off-by: Hiroaki Nakano <[e-mail]>

更改概述

• modified: l7vsd/src/l7vsadm.cpp

差异

--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -2993,13 +2993,14 @@ bool l7vs::l7vsadm::execute(int argc, char *argv[])
         set_parameter();
 
         // Get l7vsadm execute file path from /proc/(pid)/exe (symbolic link)
+        ssize_t ret;
         char l7vsadm_file_path[256];
         memset(l7vsadm_file_path, 0, sizeof(l7vsadm_file_path));
-        readlink("/proc/self/exe", l7vsadm_file_path, sizeof(l7vsadm_file_path));
+        ret = readlink("/proc/self/exe", l7vsadm_file_path, sizeof(l7vsadm_file_path));
 
         // L7vsadm command conflict check. (Try l7vsadm execute file lock)
         file_lock lock(l7vsadm_file_path, l7vsadm_err);
-        if (l7vsadm_err) {
+        if (l7vsadm_err || ret == -1) {
                 std::cerr << "COMMON ERROR: " << l7vsadm_err.get_message() << std::endl;
                 Logger::putLogError(LOG_CAT_L7VSADM_COMMON, 2, l7vsadm_err.get_message(), __FILE__, __LINE__);
                 return false;