Merge branch 'master' of github.com:mailru/tarantool

CMakeLists.txt

@@ -175,10 +175,10 @@ include_directories("${PROJECT_SOURCE_DIR}/connector/c/tntnet/include")
 # Specify prefixes
 #
 if (NOT DEFINED CMAKE_SYSCONF_DIR)
-    set (CMAKE_SYSCONF_DIR "${CMAKE_INSTALL_PREFIX}/etc")
+    set (CMAKE_SYSCONF_DIR "etc")
 endif()
 if (NOT DEFINED CMAKE_LOCALSTATE_DIR)
-    set (CMAKE_LOCALSTATE_DIR "${CMAKE_INSTALL_PREFIX}/var")
+    set (CMAKE_LOCALSTATE_DIR "var")
 endif()
 
 #

connector/c/tnt/tnt_buf.c

@@ -116,7 +116,7 @@ tnt_buf_reply(struct tnt_stream *s, struct tnt_reply *r) {
 	if (sb->size == sb->rdoff)
 		return 1;
 	size_t off = 0;
-	int rc = tnt_reply(r, s->data + sb->rdoff, sb->size - sb->rdoff, &off);
+	int rc = tnt_reply(r, sb->data + sb->rdoff, sb->size - sb->rdoff, &off);
 	if (rc == 0)
 		sb->rdoff += off;
 	return rc;