From c55881f9ce5973486e9e395995b05b57b156fc44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Wed, 14 Nov 2012 18:55:28 +0100 Subject: [PATCH] Fix compile warnings --- src/pygit2/config.c | 20 ++++++++++---------- src/pygit2/signature.c | 2 +- src/pygit2/tree.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pygit2/config.c b/src/pygit2/config.c index 508550c..5924a95 100644 --- a/src/pygit2/config.c +++ b/src/pygit2/config.c @@ -133,9 +133,10 @@ int Config_contains(Config *self, PyObject *py_key) { int err; const char *c_value; - const char *c_key; + char *c_key; - if (!(c_key = py_str_to_c_str(py_key,NULL))) + c_key = py_str_to_c_str(py_key,NULL); + if (c_key == NULL) return -1; err = git_config_get_string(&c_value, self->config, c_key); @@ -154,10 +155,10 @@ PyObject * Config_getitem(Config *self, PyObject *py_key) { int err; - int64_t c_intvalue; - int c_boolvalue; - const char *c_charvalue; - const char *c_key; + int64_t c_intvalue; + int c_boolvalue; + const char *c_charvalue; + char *c_key; if (!(c_key = py_str_to_c_str(py_key,NULL))) return NULL; @@ -191,8 +192,8 @@ int Config_setitem(Config *self, PyObject *py_key, PyObject *py_value) { int err; - const char *c_key; - const char *py_str; + char *c_key; + char *py_str; if (!(c_key = py_str_to_c_str(py_key,NULL))) return -1; @@ -208,8 +209,7 @@ Config_setitem(Config *self, PyObject *py_key, PyObject *py_value) } else { py_value = PyObject_Str(py_value); py_str = py_str_to_c_str(py_value,NULL); - err = git_config_set_string(self->config, c_key, - py_str); + err = git_config_set_string(self->config, c_key, py_str); free(py_str); } diff --git a/src/pygit2/signature.c b/src/pygit2/signature.c index cd53a32..cb8425d 100644 --- a/src/pygit2/signature.c +++ b/src/pygit2/signature.c @@ -85,7 +85,7 @@ Signature_dealloc(Signature *self) Py_DECREF(self->obj); else { git_signature_free((git_signature*)self->signature); - free((void*)self->encoding); + free((char*)self->encoding); } Py_TYPE(self)->tp_free((PyObject*)self); } diff --git a/src/pygit2/tree.c b/src/pygit2/tree.c index c3921af..a4004c6 100644 --- a/src/pygit2/tree.c +++ b/src/pygit2/tree.c @@ -43,7 +43,7 @@ void TreeEntry_dealloc(TreeEntry *self) { Py_XDECREF(self->owner); - git_tree_entry_free(self->entry); + git_tree_entry_free((git_tree_entry*)self->entry); PyObject_Del(self); }