Do not use deprecated functions

Author: jdavid

pygit2/config.py

@@ -264,7 +264,7 @@ def _from_found_config(fn):
         err = fn(buf)
         check_error(err, True)
         cpath = ffi.string(buf.ptr).decode('utf-8')
-        C.git_buf_free(buf)
+        C.git_buf_dispose(buf)
 
         return Config(cpath)
 

pygit2/decl.h

@@ -22,7 +22,7 @@ typedef struct {
 	char   *ptr;
 	size_t asize, size;
 } git_buf;
-void git_buf_free(git_buf *buffer);
+void git_buf_dispose(git_buf *buffer);
 
 typedef struct git_strarray {
 	char **strings;
@@ -92,7 +92,7 @@ typedef struct git_signature {
 
 int git_libgit2_features(void);
 
-const git_error * giterr_last(void);
+const git_error * git_error_last(void);
 
 void git_strarray_free(git_strarray *array);
 void git_repository_free(git_repository *repo);

pygit2/errors.py

@@ -38,7 +38,7 @@ def check_error(err, io=False):
         return
 
     # Error message
-    giterr = C.giterr_last()
+    giterr = C.git_error_last()
     if giterr != ffi.NULL:
         message = ffi.string(giterr.message).decode('utf8')
     else:

src/branch.c

@@ -169,7 +169,7 @@ Branch_remote_name__get__(Branch *self)
         return Error_set(err);
 
     py_name = to_unicode(name.ptr, NULL, NULL);
-    git_buf_free(&name);
+    git_buf_dispose(&name);
 
     return py_name;
 }
@@ -247,7 +247,7 @@ Branch_upstream_name__get__(Branch *self)
         return Error_set(err);
 
     py_name = to_unicode(name.ptr, NULL, NULL);
-    git_buf_free(&name);
+    git_buf_dispose(&name);
 
     return py_name;
 }

src/commit.c

@@ -79,8 +79,8 @@ Commit_gpg_signature__get__(Commit *commit)
     );
 
     if (err != GIT_OK){
-        git_buf_free(&gpg_signature);
-        git_buf_free(&signed_data);
+        git_buf_dispose(&gpg_signature);
+        git_buf_dispose(&signed_data);
 
         if (err == GIT_ENOTFOUND){
             return Py_BuildValue("OO", Py_None, Py_None);
@@ -91,8 +91,8 @@ Commit_gpg_signature__get__(Commit *commit)
 
     py_gpg_signature = PyBytes_FromString(gpg_signature.ptr);
     py_signed_data = PyBytes_FromString(signed_data.ptr);
-    git_buf_free(&gpg_signature);
-    git_buf_free(&signed_data);
+    git_buf_dispose(&gpg_signature);
+    git_buf_dispose(&signed_data);
 
     return Py_BuildValue("NN", py_gpg_signature, py_signed_data);
 }

src/diff.c

@@ -618,10 +618,10 @@ Diff_patch__get__(Diff *self)
     }
 
     py_patch = to_unicode(buf.ptr, NULL, NULL);
-    git_buf_free(&buf);
+    git_buf_dispose(&buf);
 
 cleanup:
-    git_buf_free(&buf);
+    git_buf_dispose(&buf);
     return (err < 0) ? Error_set(err) : py_patch;
 }
 
@@ -816,7 +816,7 @@ DiffStats_format(DiffStats *self, PyObject *args, PyObject *kwds)
         return Error_set(err);
 
     str = to_unicode(buf.ptr, NULL, NULL);
-    git_buf_free(&buf);
+    git_buf_dispose(&buf);
 
     return str;
 }

src/error.c

@@ -67,7 +67,7 @@ Error_type(int type)
     }
 
     /* Critical */
-    error = giterr_last();
+    error = git_error_last();
     if (error != NULL) {
         switch (error->klass) {
             case GITERR_NOMEMORY:
@@ -93,7 +93,7 @@ Error_set(int err)
 PyObject *
 Error_set_exc(PyObject* exception)
 {
-    const git_error* error = giterr_last();
+    const git_error* error = git_error_last();
     char* message = (error == NULL) ?
             "(No error information given)" : error->message;
     PyErr_SetString(exception, message);
@@ -112,7 +112,7 @@ Error_set_str(int err, const char *str)
         return NULL;
     }
 
-    error = giterr_last();
+    error = git_error_last();
     if (error == NULL) /* Expected error - no error msg set */
         return PyErr_Format(Error_type(err), "%s", str);
 

src/object.c

@@ -107,7 +107,7 @@ Object_short_id__get__(Object *self)
         return Error_set(err);
 
     py_short_id = to_unicode_n(short_id.ptr, short_id.size, NULL, "strict");
-    git_buf_free(&short_id);
+    git_buf_dispose(&short_id);
     return py_short_id;
 }
 

src/options.c

@@ -46,7 +46,7 @@ get_search_path(long level)
         return Error_set(err);
 
     py_path = to_unicode(buf.ptr, NULL, NULL);
-    git_buf_free(&buf);
+    git_buf_dispose(&buf);
 
     if (!py_path)
         return NULL;

src/patch.c

@@ -186,7 +186,7 @@ Patch_patch__get__(Patch *self)
         return Error_set(err);
 
     py_patch = to_unicode(buf.ptr, NULL, NULL);
-    git_buf_free(&buf);
+    git_buf_dispose(&buf);
     return py_patch;
 }
 

src/pygit2.c

@@ -99,7 +99,7 @@ discover_repository(PyObject *self, PyObject *args)
         return Error_set_str(err, path);
 
     py_repo_path = to_path(repo_path.ptr);
-    git_buf_free(&repo_path);
+    git_buf_dispose(&repo_path);
 
     return py_repo_path;
 };