fix compile when running unit-test

baidu · Jan 20, 2016 · 0a36ae6 · 0a36ae6
1 parent 9bd6aa5
commit 0a36ae6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ install:
     - tar xf protobuf-$PROTOBUF_VERSION.tar.gz
     - ( cd protobuf-$PROTOBUF_VERSION && ./configure && make -j4 && sudo make install && sudo ldconfig )
     - git clone https://github.com/google/snappy
-    - ( cd snappy && sh ./autogen.sh && ./configure && make -j4 && sudo make install )
+    - ( cd snappy && sh ./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig )
     - sudo apt-get install zlib1g-dev
     - git clone https://github.com/google/googletest.git
 script:

diff --git a/src/sofa/pbrpc/buffer.cc b/src/sofa/pbrpc/buffer.cc
@@ -46,7 +46,8 @@ void ReadBuffer::Append(const ReadBuffer* read_buffer)
     SCHECK(read_buffer != NULL);
     BufHandleList::const_iterator it = read_buffer->_buf_list.begin();
     BufHandleList::const_iterator end = read_buffer->_buf_list.end();
-    for (; it != end; ++it) {
+    for (; it != end; ++it) 
+    {
         _buf_list.push_back(*it);
         TranBufPool::add_ref(it->data);
     }
@@ -316,12 +317,9 @@ bool WriteBuffer::Append(const std::string& data)
 
 bool WriteBuffer::Append(const char* data, int size)
 {
-    if (size <= 0)
-    {
-        return false;
-    }
-
-    int64_t head = Reserve(size);
+    SCHECK_GE(size, 0);
+    if (size == 0) return true;
+    int64 head = Reserve(size);
     if (head < 0)
     {
         return false;

diff --git a/src/sofa/pbrpc/web_service.cc b/src/sofa/pbrpc/web_service.cc
@@ -69,7 +69,7 @@ static std::string FormatPath(const std::string& path)
     {
         if (!path_vec[i].empty())
         {
-            os << ROOT_PATH << path_vec[i];
+            os << PATH_SPLITTER << path_vec[i];
         }
     }
     return os.str().empty() ? ROOT_PATH : os.str();
@@ -255,7 +255,7 @@ Servlet WebService::FindServlet(const std::string& path)
     size_t cur_pos = 0;
     while (cur_pos < path_size)
     {
-        cur_pos = real_path.find(ROOT_PATH, cur_pos + 1);
+        cur_pos = real_path.find(PATH_SPLITTER, cur_pos + 1);
         if (cur_pos == std::string::npos)
         {
             ServletMap::const_iterator find = servlets->find(real_path);
@@ -275,7 +275,7 @@ Servlet WebService::FindServlet(const std::string& path)
         size_t find_path_size = find_path.size();
         if (find_path_size <= path_size
             && strncmp(real_path.data(), find_path.data(), find_path_size) == 0
-            && (find_path_size == path_size || real_path[find_path_size] == ROOT_PATH[0]))
+            && (find_path_size == path_size || real_path[find_path_size] == PATH_SPLITTER[0]))
         {
             ret = find->second.first;
             cur_pos = find_path_size;