diff --git a/src/blame.c b/src/blame.c index b238f05..4fe1770 100644 --- a/src/blame.c +++ b/src/blame.c @@ -70,18 +70,18 @@ wrap_blame_hunk(const git_blame_hunk *hunk, Blame *blame) py_hunk->final_commit_id = git_oid_allocfmt(&hunk->final_commit_id); py_hunk->final_start_line_number = hunk->final_start_line_number; - py_hunk->final_signature = NULL; - if (hunk->final_signature) - git_signature_dup(&py_hunk->final_signature, hunk->final_signature); + py_hunk->final_signature = NULL; + if (hunk->final_signature) + git_signature_dup(&py_hunk->final_signature, hunk->final_signature); py_hunk->orig_commit_id = git_oid_allocfmt(&hunk->orig_commit_id); py_hunk->orig_path = hunk->orig_path != NULL ? - strdup(hunk->orig_path) : NULL; + strdup(hunk->orig_path) : NULL; py_hunk->orig_start_line_number = hunk->orig_start_line_number; - py_hunk->orig_signature = NULL; - if (hunk->orig_signature) - git_signature_dup(&py_hunk->orig_signature, hunk->orig_signature); + py_hunk->orig_signature = NULL; + if (hunk->orig_signature) + git_signature_dup(&py_hunk->orig_signature, hunk->orig_signature); py_hunk->boundary = hunk->boundary; } diff --git a/src/options.c b/src/options.c index 1679a93..f6eaa5e 100644 --- a/src/options.c +++ b/src/options.c @@ -70,94 +70,95 @@ option(PyObject *self, PyObject *args) option = PyLong_AsLong(py_option); - switch (option) { - case GIT_OPT_GET_SEARCH_PATH: - { - PyObject *py_level; + switch (option) { + case GIT_OPT_GET_SEARCH_PATH: + { + PyObject *py_level; - py_level = PyTuple_GetItem(args, 1); - if (!py_level) - return NULL; + py_level = PyTuple_GetItem(args, 1); + if (!py_level) + return NULL; - if (!PyLong_Check(py_level)) - goto on_non_integer; + if (!PyLong_Check(py_level)) + goto on_non_integer; - return get_search_path(PyLong_AsLong(py_level)); - break; - } - - case GIT_OPT_SET_SEARCH_PATH: - { - PyObject *py_level, *py_path, *tpath; - const char *path; - int err; - - py_level = PyTuple_GetItem(args, 1); - if (!py_level) - return NULL; - - py_path = PyTuple_GetItem(args, 2); - if (!py_path) - return NULL; - - if (!PyLong_Check(py_level)) - goto on_non_integer; - - path = py_str_borrow_c_str(&tpath, py_path, NULL); - if (!path) - return NULL; - - err = git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, PyLong_AsLong(py_level), path); - Py_DECREF(tpath); - - if (err < 0) { - Error_set(err); - return NULL; + return get_search_path(PyLong_AsLong(py_level)); + break; } - Py_RETURN_NONE; - break; - } + case GIT_OPT_SET_SEARCH_PATH: + { + PyObject *py_level, *py_path, *tpath; + const char *path; + int err; - case GIT_OPT_GET_MWINDOW_SIZE: - { - size_t size; + py_level = PyTuple_GetItem(args, 1); + if (!py_level) + return NULL; - if ((error = git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &size)) < 0) { - Error_set(error); - return NULL; + py_path = PyTuple_GetItem(args, 2); + if (!py_path) + return NULL; + + if (!PyLong_Check(py_level)) + goto on_non_integer; + + path = py_str_borrow_c_str(&tpath, py_path, NULL); + if (!path) + return NULL; + + err = git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, PyLong_AsLong(py_level), path); + Py_DECREF(tpath); + + if (err < 0) { + Error_set(err); + return NULL; + } + + Py_RETURN_NONE; + break; } - return PyLong_FromSize_t(size); + case GIT_OPT_GET_MWINDOW_SIZE: + { + size_t size; - break; - } + error = git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &size); + if (error < 0) { + Error_set(error); + return NULL; + } - case GIT_OPT_SET_MWINDOW_SIZE: - { - size_t size; - PyObject *py_size; + return PyLong_FromSize_t(size); - py_size = PyTuple_GetItem(args, 1); - if (!py_size) - return NULL; - - if (!PyLong_Check(py_size)) - goto on_non_integer; - - - size = PyLong_AsSize_t(py_size); - if ((error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, size)) < 0) { - Error_set(error); - return NULL; + break; } - Py_RETURN_NONE; - break; - } - } + case GIT_OPT_SET_MWINDOW_SIZE: + { + size_t size; + PyObject *py_size; - PyErr_SetString(PyExc_ValueError, "unknown/unsupported option value"); + py_size = PyTuple_GetItem(args, 1); + if (!py_size) + return NULL; + + if (!PyLong_Check(py_size)) + goto on_non_integer; + + size = PyLong_AsSize_t(py_size); + error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, size); + if (error < 0) { + Error_set(error); + return NULL; + } + + Py_RETURN_NONE; + break; + } + } + + PyErr_SetString(PyExc_ValueError, "unknown/unsupported option value"); return NULL; on_non_integer: diff --git a/src/reference.c b/src/reference.c index b2b5bd2..d86d8a8 100644 --- a/src/reference.c +++ b/src/reference.c @@ -62,7 +62,7 @@ RefLogIter_iternext(RefLogIter *self) py_entry->oid_old = git_oid_allocfmt(git_reflog_entry_id_old(entry)); py_entry->oid_new = git_oid_allocfmt(git_reflog_entry_id_new(entry)); py_entry->message = strdup(git_reflog_entry_message(entry)); - git_signature_dup(&py_entry->signature, git_reflog_entry_committer(entry)); + git_signature_dup(&py_entry->signature, git_reflog_entry_committer(entry)); ++(self->i);