Build with libgit2 1.4.0+

Author: craigds

CMakeLists.txt

@@ -7,7 +7,7 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 # Add libgit2
 find_package(PkgConfig)
 if(PkgConfig_FOUND)
-  PKG_CHECK_MODULES(LIBGIT2 libgit2>=0.99)
+  PKG_CHECK_MODULES(LIBGIT2 libgit2>=1.4.0)
 endif()
 if(NOT LIBGIT2_FOUND)
   ADD_SUBDIRECTORY(ext/libgit2 ${CMAKE_BINARY_DIR}/lib)

ext/libgit2

@@ -17,16 +17,14 @@ data_buffer::data_buffer(size_t n) {
   c_struct_.ptr = (char *)malloc(n * sizeof(char));
   if (c_struct_.ptr)
     memset(c_struct_.ptr, '\0', n * sizeof(char));
-  c_struct_.asize = n;
-  c_struct_.size = 0;
+  c_struct_.size = n;
 }
 
 data_buffer::data_buffer(const git_buf *c_ptr) {
-  c_struct_.ptr = (char *)malloc(c_ptr->asize * sizeof(char));
-  c_struct_.asize = c_ptr->asize;
+  c_struct_.ptr = (char *)malloc(c_ptr->size * sizeof(char));
   c_struct_.size = c_ptr->size;
   if (c_struct_.ptr)
-    strncpy(c_struct_.ptr, c_ptr->ptr, c_ptr->asize);
+    strncpy(c_struct_.ptr, c_ptr->ptr, c_ptr->size);
 }
 
 data_buffer::~data_buffer() {
@@ -37,19 +35,15 @@ data_buffer::~data_buffer() {
 data_buffer::data_buffer(data_buffer&& other) {
   c_struct_.size = other.c_struct_.size;
   c_struct_.ptr = other.c_struct_.ptr;
-  c_struct_.asize = other.c_struct_.asize;
   other.c_struct_.size = 0;
-  other.c_struct_.asize = 0;
   other.c_struct_.ptr = nullptr;
 }
 
 data_buffer& data_buffer::operator= (data_buffer&& other) {
   if (other.c_struct_.ptr != c_struct_.ptr) {
     c_struct_.size = other.c_struct_.size;
     c_struct_.ptr = other.c_struct_.ptr;
-    c_struct_.asize = other.c_struct_.asize;
     other.c_struct_.size = 0;
-    other.c_struct_.asize = 0;
     other.c_struct_.ptr = nullptr;
   }
   return *this;