adjusting ANSI-C syntax. (work in progress).

C99 does not accept on Windows environment. so i'm adjusting these horrible variable declarations.

Author: chobie

src/backend.c

@@ -93,10 +93,7 @@ int php_git_backend__exists(git_odb_backend *_backend, const git_oid *oid)
     php_git_backend_internal *object = (php_git_backend_internal *)_backend;
     char out[GIT_OID_HEXSZ+1] = {0};
     git_oid_to_string(out,GIT_OID_HEXSZ+1,oid);
-
-    zval *retval;
-    zval *params[1];
-    zval func;
+    zval *retval, *params[1], func;
     int result;
 
     MAKE_STD_ZVAL(retval);
@@ -130,11 +127,11 @@ int php_git_backend__write(git_oid *id, git_odb_backend *_backend, const void *b
     zval *retval;
     zval *params[1];
     zval func;
+
     MAKE_STD_ZVAL(retval);
     ZVAL_NULL(retval);
     ZVAL_STRING(&func,"write", 1);
 
-
     MAKE_STD_ZVAL(params[0]);
     object_init_ex(params[0],git_rawobject_class_entry);
 
@@ -171,10 +168,7 @@ int php_git_backend__read(void **buffer,size_t size, git_otype *type, git_odb_ba
     char out[GIT_OID_HEXSZ+1] = {0};
     git_oid_to_string(out,GIT_OID_HEXSZ+1,oid);
     int result = GIT_ERROR;
-
-    zval *retval;
-    zval *params[1];
-    zval func;
+    zval *str, *len, *tp, *retval, *params[1], func;
 
     MAKE_STD_ZVAL(retval);
     ZVAL_NULL(retval);
@@ -202,9 +196,9 @@ int php_git_backend__read(void **buffer,size_t size, git_otype *type, git_odb_ba
         goto cleanup;
     }
 
-    zval *str = zend_read_property(git_rawobject_class_entry, retval,"data",4, 0 TSRMLS_CC);
-    zval *len = zend_read_property(git_rawobject_class_entry, retval,"len",3, 0 TSRMLS_CC);
-    zval *tp = zend_read_property(git_rawobject_class_entry, retval,"type",4, 0 TSRMLS_CC);
+    str = zend_read_property(git_rawobject_class_entry, retval,"data",4, 0 TSRMLS_CC);
+    len = zend_read_property(git_rawobject_class_entry, retval,"len",3, 0 TSRMLS_CC);
+    tp = zend_read_property(git_rawobject_class_entry, retval,"type",4, 0 TSRMLS_CC);
 
     buffer = calloc(1,Z_LVAL_P(len));
     memcpy(buffer,Z_STRVAL_P(str),Z_LVAL_P(len));
@@ -227,10 +221,7 @@ int php_git_backend__read_header(size_t size, git_otype *type, git_odb_backend *
     php_git_backend_internal *object = (php_git_backend_internal *)_backend;
     char out[GIT_OID_HEXSZ+1] = {0};
     git_oid_to_string(out,GIT_OID_HEXSZ+1,oid);
-
-    zval *retval;
-    zval *params[1];
-    zval func;
+    zval *len, *tp, *retval, *params[1], func;
 
     MAKE_STD_ZVAL(retval);
     ZVAL_NULL(retval);
@@ -251,8 +242,8 @@ int php_git_backend__read_header(size_t size, git_otype *type, git_odb_backend *
         return GIT_ENOTFOUND;
     }
 
-    zval *len = zend_read_property(git_rawobject_class_entry, retval,"len",3, 0 TSRMLS_CC);
-    zval *tp = zend_read_property(git_rawobject_class_entry, retval,"type",4, 0 TSRMLS_CC);
+    len = zend_read_property(git_rawobject_class_entry, retval,"len",3, 0 TSRMLS_CC);
+    tp = zend_read_property(git_rawobject_class_entry, retval,"type",4, 0 TSRMLS_CC);
 
     type = Z_LVAL_P(tp);
     size = Z_LVAL_P(len);
@@ -267,11 +258,9 @@ int php_git_backend__read_header(size_t size, git_otype *type, git_odb_backend *
 void php_git_backend__free(git_odb_backend *backend)
 {
     TSRMLS_FETCH();
+    zval func, *retval;
     php_git_backend_internal *object = (php_git_backend_internal *)backend;
 
-    zval *retval;
-    zval func;
-
     MAKE_STD_ZVAL(retval);
     ZVAL_NULL(retval);
 

src/blob.c

@@ -131,6 +131,7 @@ PHP_METHOD(git_blob, loadString)
 PHP_METHOD(git_blob, write)
 {
     php_git_blob_t *this = (php_git_blob_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
+    char oid_str[GIT_OID_HEXSZ+1] = {0};
     git_oid out;
     int ret = 0;
 
@@ -148,7 +149,6 @@ PHP_METHOD(git_blob, write)
         }
     }
 
-    char oid_str[GIT_OID_HEXSZ+1] = {0};
     git_oid_to_string(oid_str,GIT_OID_HEXSZ+1,&out);
     RETVAL_STRING(oid_str,1);
 }

src/commit.c

@@ -93,10 +93,10 @@ zend_object_value php_git_commit_new(zend_class_entry *ce TSRMLS_DC)
 
 PHP_METHOD(git_commit, __construct)
 {
+    zval *object = getThis();
     zval *z_repository;
     git_commit *commit;
     git_repository *repository;
-    zval *object = getThis();
     int ret;
 
     if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -141,20 +141,19 @@ PHP_METHOD(git_commit, getShortMessage)
 PHP_METHOD(git_commit, getTree)
 {
     php_git_commit_t *this = (php_git_commit_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
-    git_tree *ref_tree;
+    git_tree *ref_tree, *tree;
+    git_oid *tree_oid;
+    zval *git_tree, *entry;
+
+    const git_oid *oid = git_object_id((git_object*)ref_tree);
     git_commit_tree(&ref_tree, this->object);
-    const git_oid *oid = 	git_object_id((git_object*)ref_tree);
 
-    git_tree *tree;
     int ret = git_object_lookup((git_object **)&tree, git_object_owner((git_object*)this->object),oid, GIT_OBJ_TREE);
     if(ret != GIT_SUCCESS) {
         php_error_docref(NULL TSRMLS_CC, E_ERROR, "specified tree not found.");
         return;
     }
 
-    git_oid *tree_oid;
-    zval *git_tree;
-    zval *entry;
 
     MAKE_STD_ZVAL(git_tree);
     object_init_ex(git_tree, git_tree_class_entry);
@@ -232,20 +231,23 @@ PHP_METHOD(git_commit, setParents)
 PHP_METHOD(git_commit, write)
 {
     php_git_commit_t *this = (php_git_commit_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
-    git_oid oid;
-    php_git_signature_t *author;
-    php_git_signature_t *committer;
+    git_oid oid, tree_oid, **parents, **p, *tmp;
+    php_git_signature_t *author, *committer;
+    zval *z_author, *z_committer, *z_parents, **data;
+    char *update_ref, *message, *tree_oid_str = NULL;
+    char out[GIT_OID_HEXSZ+1];
+    int count, i, update_ref_len = 0;
+    git_reference *ref;
 
-    char *update_ref = NULL;
-    int update_ref_len = 0;
+    HashTable *array_hash;
+    HashPosition pointer;
 
     if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
         "|s", &update_ref,&update_ref_len) == FAILURE){
         return;
     }
 
     if(ZEND_NUM_ARGS() == 0) {
-        git_reference *ref;
         if(git_reference_lookup(&ref,this->repository,"HEAD")==GIT_SUCCESS){
             if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
                 git_reference *ref2;
@@ -258,27 +260,22 @@ PHP_METHOD(git_commit, write)
     }
 
 
-    git_oid tree_oid;
-    char *tree_oid_str = Z_STRVAL_P(zend_read_property(git_commit_class_entry, getThis(),"tree",sizeof("tree")-1, 0 TSRMLS_CC));
+    tree_oid_str = Z_STRVAL_P(zend_read_property(git_commit_class_entry, getThis(),"tree",sizeof("tree")-1, 0 TSRMLS_CC));
     git_oid_fromstr(&tree_oid, tree_oid_str);
 
-    zval *z_author = zend_read_property(git_commit_class_entry, getThis(),"author",sizeof("author")-1, 0 TSRMLS_CC);
+    z_author = zend_read_property(git_commit_class_entry, getThis(),"author",sizeof("author")-1, 0 TSRMLS_CC);
     author = (php_git_signature_t *) zend_object_store_get_object(z_author TSRMLS_CC);
 
-    zval *z_committer = zend_read_property(git_commit_class_entry, getThis(),"committer",sizeof("committer")-1, 0 TSRMLS_CC);
+    z_committer = zend_read_property(git_commit_class_entry, getThis(),"committer",sizeof("committer")-1, 0 TSRMLS_CC);
     committer = (php_git_signature_t *) zend_object_store_get_object(z_committer TSRMLS_CC);
 
-    zval *z_parents = zend_read_property(git_commit_class_entry, getThis(),"parents",sizeof("parents")-1, 0 TSRMLS_CC);
+    z_parents = zend_read_property(git_commit_class_entry, getThis(),"parents",sizeof("parents")-1, 0 TSRMLS_CC);
 
-    int count = zend_hash_num_elements(Z_ARRVAL_P(z_parents));
+    count = zend_hash_num_elements(Z_ARRVAL_P(z_parents));
 
 
-    HashTable *array_hash = Z_ARRVAL_P(z_parents);
-    HashPosition pointer;
-    git_oid *tmp;
-    zval **data;
-    git_oid **p;
-    git_oid **parents = (git_oid**)calloc(count,sizeof(git_oid));
+    array_hash = Z_ARRVAL_P(z_parents);
+    parents = (git_oid**)calloc(count,sizeof(git_oid));
     p = parents;
 
     for (zend_hash_internal_pointer_reset_ex(array_hash, &pointer);
@@ -293,7 +290,7 @@ PHP_METHOD(git_commit, write)
         p++;
     }
 
-    char *message = Z_STRVAL_P(zend_read_property(git_commit_class_entry, getThis(),"message",sizeof("message")-1, 0 TSRMLS_CC));
+    message = Z_STRVAL_P(zend_read_property(git_commit_class_entry, getThis(),"message",sizeof("message")-1, 0 TSRMLS_CC));
     git_commit_create(&oid,
         this->repository,
         update_ref,
@@ -305,10 +302,8 @@ PHP_METHOD(git_commit, write)
         parents
     );
 
-    char out[GIT_OID_HEXSZ+1];
     git_oid_to_string(out,GIT_OID_HEXSZ+1,&oid);
 
-    int i;
     for(i = 0; i < count;i++){
         free(parents[i]);
     }

src/config.c

@@ -60,27 +60,21 @@ ZEND_END_ARG_INFO()
 
 typedef struct{
     zval *array;
-    git_config *config
+    git_config *config;
 } git_config_foreach_t;
 
 
 static int php_git_config_foreach(const char *key, void *data)
 {
-    zval *config = ((git_config_foreach_t*)data)->array;
-    HashTable *hash = Z_ARRVAL_P(config);
-    zval **target_key;
-    zval *moe_key;
-
-    char *tmp = estrdup(key);
-
-    char *current_key;
-    char *uu;
-    char *value;
+    HashTable *hash;
+    zval *config, *moe_key, *moe, **target_key;
+    char *savedptr, *current_key, *uu, *value, *tmp;
 
+    config = ((git_config_foreach_t*)data)->array;
+    hash =  Z_ARRVAL_P(config);
+    tmp = estrdup(key);
     git_config_get_string(((git_config_foreach_t *)data)->config,key,&value);
 
-    char *savedptr;
-
     current_key = php_strtok_r(tmp, ".",&savedptr);
     while (current_key != NULL) {
         uu = current_key;
@@ -100,15 +94,13 @@ static int php_git_config_foreach(const char *key, void *data)
     }
 
     if(uu != NULL) {
-        zval *moe;
         MAKE_STD_ZVAL(moe);
         ZVAL_STRING(moe,value,1);
         zval_copy_ctor(&moe);
         zend_hash_add(hash,uu,strlen(uu)+1,(void **)&moe,sizeof(moe),NULL);
     }
 
     efree(tmp);
-
     return GIT_SUCCESS;
 }
 
@@ -117,7 +109,6 @@ PHP_METHOD(git_config, parseFile)
     git_config_foreach_t t;
     git_config *config;
     zval *zconf;
-
     char *path;
     int path_len = 0;
     int ret = GIT_ERROR;

src/index.c

@@ -91,8 +91,9 @@ ZEND_END_ARG_INFO()
 void php_git_index_entry_create(zval **index, git_index_entry *entry)
 {
     TSRMLS_FETCH();
-    MAKE_STD_ZVAL(*index);
     char oid[GIT_OID_HEXSZ+1] = {0};
+
+    MAKE_STD_ZVAL(*index);
     object_init_ex(*index,git_index_entry_class_entry);
     git_oid_to_string(oid,GIT_OID_HEXSZ+1,&entry->oid);
 
@@ -120,9 +121,8 @@ PHP_METHOD(git_index, count)
 
 PHP_METHOD(git_index, find)
 {
-    int offset = 0;
+    int offset, path_len = 0;
     char *path;
-    int path_len = 0;
     git_index *index = NULL;
     git_index_entry *entry;
     zval *z_git_index_entry;
@@ -169,11 +169,10 @@ PHP_METHOD(git_index, getEntry)
 
 PHP_METHOD(git_index, add)
 {
-    int offset = 0;
+    int path_len, success, offset  = 0;
+    long stage = 0;
     char *path;
-    int path_len = 0;
     git_index *index = NULL;
-    long stage = 0;
 
     if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
         "s|l", &path, &path_len, &stage) == FAILURE){
@@ -183,11 +182,8 @@ PHP_METHOD(git_index, add)
     php_git_index_t *myobj = (php_git_index_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
     index = myobj->index;
 
-    //FIXME: examine stage value.
-    // 0 => new file
-    // 1 => deleted ?
-    // 2 => ?
-    int success = git_index_add(index,path,stage);
+    // Todo: check stage status.
+    success = git_index_add(index,path,stage);
     if(success != GIT_SUCCESS){
         zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
             "can't add specified index.");
@@ -200,22 +196,22 @@ PHP_METHOD(git_index, add)
 PHP_METHOD(git_index, remove)
 {
     php_git_index_t *this = (php_git_index_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
+    int path_len, offset, result = 0;
     char *path;
-    int path_len = 0;
 
     if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
         "s", &path, &path_len) == FAILURE){
         return;
     }
 
-    int offset = git_index_find(this->index,path);
+    offset = git_index_find(this->index,path);
     if(offset < 0){
         zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
             "specified path does not exist.");
         RETURN_FALSE;
     }
 
-    int result = git_index_remove(this->index, offset);
+    result = git_index_remove(this->index, offset);
     if(result != GIT_SUCCESS){
         zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
             "specified offset does not exist.");
@@ -228,8 +224,8 @@ PHP_METHOD(git_index, remove)
 PHP_METHOD(git_index, update)
 {
     php_git_index_t *myobj = (php_git_index_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
-
     int success = git_index_write(myobj->index);
+
     if(success != GIT_SUCCESS){
         zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
             "can't write index");
@@ -244,8 +240,8 @@ PHP_METHOD(git_index, refresh)
 {
     git_index *index = NULL;
     php_git_index_t *myobj = (php_git_index_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
-    index = myobj->index;
 
+    index = myobj->index;
     git_index_read(index);
 }
 
@@ -267,8 +263,9 @@ PHP_METHOD(git_index, writeTree)
     php_git_index_t *this = (php_git_index_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
     git_oid oid;
     char out[GIT_OID_HEXSZ+1];
+    int ret;
 
-    int ret = git_tree_create_fromindex(&oid, this->index);
+    ret = git_tree_create_fromindex(&oid, this->index);
     if(ret != GIT_SUCCESS) {
         zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
             "can't write tree from index.");