Skip to content

Commit 5f495c2

Browse files
chobiechobie
committed
fix several compile warnings
1 parent 3d6d07f commit 5f495c2

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

‎backend.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ static int php_git2_backend_exists(git_odb_backend *_backend, const git_oid *oid
5555

5656
static int php_git2_backend_write(git_oid *id, git_odb_backend *_backend, const void *buffer, size_t size, git_otype type)
5757
{
58-
zval *z_id, *z_buffer, *z_size, *z_type, *retval, **value;
58+
zval *z_id, *z_buffer, *z_size, *z_type, *retval;
5959
int error = GIT_ERROR;
6060
char t_id[GIT_OID_HEXSZ] = {0};
61-
TSRMLS_FETCH();
6261
php_git2_backend_internal *backend;
6362

6463
MAKE_STD_ZVAL(z_id);
@@ -101,7 +100,7 @@ static int php_git2_backend_read(void **buffer,size_t *size, git_otype *type, gi
101100
git_oid_fmt(out, id);
102101

103102
ZVAL_STRING(z_oid, out, 1);
104-
ZVAL_LONG(z_type, type);
103+
ZVAL_LONG(z_type, (long)type);
105104
m_backend = (php_git2_backend_internal*)_backend;
106105

107106
zend_call_method_with_2_params(&m_backend->self, Z_OBJCE_P(m_backend->self), NULL, "read", &retval, z_oid, z_type);
@@ -116,7 +115,7 @@ static int php_git2_backend_read(void **buffer,size_t *size, git_otype *type, gi
116115
}
117116

118117
if (zend_hash_find(hash,"size",sizeof("size"),(void **)&value_pp) != FAILURE) {
119-
size = *value_pp;
118+
z_size = *value_pp;
120119
}
121120

122121
*buffer = estrndup(Z_STRVAL_P(data),Z_STRLEN_P(data));
@@ -136,7 +135,7 @@ static int php_git2_backend_read_header(size_t *size, git_otype *type, git_odb_b
136135
TSRMLS_FETCH();
137136
zval *retval, *z_oid, *z_type;
138137
php_git2_backend_internal *m_backend;
139-
const char out[GIT_OID_HEXSZ] = {0};
138+
char out[GIT_OID_HEXSZ] = {0};
140139
int result = GIT_ERROR;
141140

142141
MAKE_STD_ZVAL(z_oid);
@@ -170,12 +169,12 @@ static int php_git2_backend_read_header(size_t *size, git_otype *type, git_odb_b
170169
return result;
171170
}
172171

173-
static int php_git2_backend_read_prefix(git_oid *id,void ** buffer, size_t * size, git_otype * type,struct git_odb_backend * _backend,const git_oid * oid,unsigned int length)
172+
static int php_git2_backend_read_prefix(git_oid *id, void ** buffer, size_t * size, git_otype * type, struct git_odb_backend * _backend, const git_oid * oid, size_t length)
174173
{
175174
TSRMLS_FETCH();
176175
zval *retval, *z_oid, *z_type;
177176
php_git2_backend_internal *m_backend;
178-
const char out[GIT_OID_HEXSZ+1] = {0};
177+
char out[GIT_OID_HEXSZ+1] = {0};
179178
int result = GIT_ERROR;
180179

181180
MAKE_STD_ZVAL(z_oid);
@@ -196,7 +195,7 @@ static int php_git2_backend_read_prefix(git_oid *id,void ** buffer, size_t * siz
196195
}
197196

198197
if (zend_hash_find(hash,"size",sizeof("size"),(void **)&value_pp) != FAILURE) {
199-
size = *value_pp;
198+
z_size = *value_pp;
200199
}
201200

202201
if (zend_hash_find(hash,"oid",sizeof("oid"),(void **)&value_pp) != FAILURE) {

‎commit.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ PHP_METHOD(git2_commit, getParents)
386386

387387
error = git_commit_parent(&parent, m_commit->commit, i);
388388
if (error == GIT_OK) {
389-
tmp = php_git2_object_new(git_object_owner((git_object *)m_commit->commit), parent TSRMLS_CC);
389+
tmp = php_git2_object_new(git_object_owner((git_object *)m_commit->commit), (git_object*)parent TSRMLS_CC);
390390
add_next_index_zval(result, tmp);
391391
}
392392
}
@@ -432,7 +432,7 @@ PHP_METHOD(git2_commit, getParent)
432432

433433
error = git_commit_parent(&parent, m_commit->commit, (unsigned int)index);
434434
if (error == GIT_OK) {
435-
result = php_git2_object_new(git_object_owner((git_object *)m_commit->commit), parent TSRMLS_CC);
435+
result = php_git2_object_new(git_object_owner((git_object *)m_commit->commit), (git_object*)parent TSRMLS_CC);
436436
RETVAL_ZVAL(result,0,1);
437437
}
438438
} else {

‎config.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ static zval* php_git2_config_read_dimension(zval *object, zval *offset, int type
9292
{
9393
zval *entry, *tmp_result, **target_offset;
9494
char *current_key, *tmp_value, *savedptr, *k;
95-
int error = 0;
9695

9796
entry = zend_read_property(git2_config_class_entry, object,"configs",sizeof("configs")-1, 0 TSRMLS_CC);
9897

@@ -279,6 +278,8 @@ static int php_git2_config_reload(zval *object, unsigned short dtor TSRMLS_DC)
279278
if (dtor == 1) {
280279
zval_ptr_dtor(&entry);
281280
}
281+
282+
return 0;
282283
}
283284

284285
static void php_git2_config_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC)

‎php_git2.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
# include "Zend/zend_interfaces.h"
3737
# include "Zend/zend_exceptions.h"
3838
# include "ext/spl/spl_exceptions.h"
39+
# include "ext/standard/php_string.h"
3940
# include <date/php_date.h>
4041
# include <git2.h>
4142
# include <git2/errors.h>

‎tree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ PHP_METHOD(git2_tree, valid)
135135
static int get_subtree(git_tree **result, git_tree *root, char *path)
136136
{
137137
char *p, *k, *current_key, *tmp_value, *savedptr = NULL;
138-
git_tree_entry *entry;
138+
const git_tree_entry *entry;
139139
git_tree *target,*tmp_result;
140140
int error = 0;
141141

0 commit comments

Comments
 (0)