Fix a few compiler warnings with clang compiler

meiyasan · Jan 11, 2021 · af28808 · af28808
1 parent cb862df
commit af28808
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 2 deletions.
diff --git a/php-closure.cpp b/php-closure.cpp
@@ -22,6 +22,9 @@ zend_function_entry php_git2::closure_methods[] = {
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_closure_object>::handlers;
+
 template<>
 void php_zend_object<php_closure_object>::init(zend_class_entry* ce)
 {

diff --git a/php-config-backend.cpp b/php-config-backend.cpp
@@ -194,6 +194,9 @@ zend_function_entry php_git2::config_backend_methods[] = {
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_config_backend_object>::handlers;
+
 template<>
 void php_zend_object<php_config_backend_object>::init(zend_class_entry* ce)
 {

diff --git a/php-git2.cpp b/php-git2.cpp
@@ -487,7 +487,7 @@ void php_git2::convert_diff_file(zval* zv,const git_diff_file* file)
 
     array_init(zv);
     add_assoc_stringl(zv,"id",buf,idlen);
-    add_assoc_string(zv,"path",file->path);
+    add_assoc_string(zv,"path",const_cast<char*>(file->path));
     add_assoc_long_ex(zv,"size",sizeof("size")-1,file->size);
     add_assoc_long_ex(zv,"flags",sizeof("flags")-1,file->flags);
     add_assoc_long_ex(zv,"mode",sizeof("mode")-1,file->mode);

diff --git a/php-object.h b/php-object.h
@@ -102,7 +102,7 @@ namespace php_git2
                 reinterpret_cast<char*>(Z_OBJ_P(zv)) - offset()
                 )->storage;
         }
-   };
+    };
 
     // Define base class for object PHP values.
 

diff --git a/php-odb-backend-internal.cpp b/php-odb-backend-internal.cpp
@@ -106,6 +106,12 @@ void php_git2::php_git2_make_odb_backend(
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_backend_object>::handlers;
+
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_backend_internal_object>::handlers;
+
 template<>
 void php_zend_object<php_odb_backend_internal_object>::init(zend_class_entry* ce)
 {

diff --git a/php-odb-backend.cpp b/php-odb-backend.cpp
@@ -84,6 +84,9 @@ zend_function_entry php_git2::odb_backend_methods[] = {
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_backend_object>::handlers;
+
 template<>
 void php_zend_object<php_odb_backend_object>::init(zend_class_entry* ce)
 {

diff --git a/php-odb-stream-internal.cpp b/php-odb-stream-internal.cpp
@@ -49,6 +49,12 @@ void php_git2::php_git2_make_odb_stream(zval* zp,git_odb_stream* stream,php_git_
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_stream_object>::handlers;
+
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_stream_internal_object>::handlers;
+
 template<>
 void php_zend_object<php_odb_stream_internal_object>::init(zend_class_entry* ce)
 {

diff --git a/php-odb-stream.cpp b/php-odb-stream.cpp
@@ -38,6 +38,9 @@ zend_function_entry php_git2::odb_stream_methods[] = {
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_stream_object>::handlers;
+
 template<>
 void php_zend_object<php_odb_stream_object>::init(zend_class_entry* ce)
 {

diff --git a/php-odb-writepack-internal.cpp b/php-odb-writepack-internal.cpp
@@ -71,6 +71,12 @@ void php_git2::php_git2_make_odb_writepack(
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_writepack_object>::handlers;
+
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_writepack_internal_object>::handlers;
+
 template<>
 void php_zend_object<php_odb_writepack_internal_object>::init(zend_class_entry* ce)
 {

diff --git a/php-odb-writepack.cpp b/php-odb-writepack.cpp
@@ -39,6 +39,9 @@ zend_function_entry php_git2::odb_writepack_methods[] = {
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_odb_writepack_object>::handlers;
+
 template<>
 void php_zend_object<php_odb_writepack_object>::init(zend_class_entry* ce)
 {

diff --git a/php-refdb-backend-internal.cpp b/php-refdb-backend-internal.cpp
@@ -79,6 +79,12 @@ void php_git2::php_git2_make_refdb_backend(zval* zp,git_refdb_backend* backend,p
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_refdb_backend_object>::handlers;
+
+template<>
+zend_object_handlers php_git2::php_zend_object<php_refdb_backend_internal_object>::handlers;
+
 template<>
 void php_zend_object<php_refdb_backend_internal_object>::init(zend_class_entry* ce)
 {

diff --git a/php-refdb-backend.cpp b/php-refdb-backend.cpp
@@ -240,6 +240,9 @@ zend_function_entry php_git2::refdb_backend_methods[] = {
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_refdb_backend_object>::handlers;
+
 template<>
 void php_zend_object<php_refdb_backend_object>::init(zend_class_entry* ce)
 {

diff --git a/php-writestream.cpp b/php-writestream.cpp
@@ -30,6 +30,9 @@ void php_git2::php_git2_make_writestream(zval* zp,git_writestream* ws)
 
 // php_zend_object init function
 
+template<>
+zend_object_handlers php_git2::php_zend_object<php_writestream_object>::handlers;
+
 template<>
 void php_zend_object<php_writestream_object>::init(zend_class_entry* ce)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ namespace php_git2 @@
                     reinterpret_cast<char*>(Z_OBJ_P(zv)) - offset()
                     )->storage;
             }
-       };
+        };
         // Define base class for object PHP values.
@@ Expand Down @@