fix compiler warnings

laruence · laruence · commit 1fafca27825e · 2012-09-14T23:03:02.000+08:00
diff --git a/msgpack.c b/msgpack.c
@@ -5,11 +5,10 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
-#include "ext/standard/php_incomplete_class.h"
-#include "ext/standard/php_var.h"
-#include "ext/session/php_session.h"
+#include "ext/standard/info.h" /* for php_info */
+#include "ext/standard/php_incomplete_class.h" /* for incomplete_class */
+#include "ext/standard/php_var.h" /* for PHP_VAR_SERIALIZE */
+#include "ext/session/php_session.h" /* for php_session_register_serializer */
 
 #include "php_msgpack.h"
 #include "msgpack_pack.h"
@@ -47,7 +46,7 @@ PHP_INI_END()
 
 PS_SERIALIZER_FUNCS(msgpack);
 
-static const zend_function_entry msgpack_functions[] = {
+static zend_function_entry msgpack_functions[] = {
     ZEND_FE(msgpack_serialize, arginfo_msgpack_serialize)
     ZEND_FE(msgpack_unserialize, arginfo_msgpack_unserialize)
     ZEND_FALIAS(msgpack_pack, msgpack_serialize, arginfo_msgpack_serialize)
diff --git a/msgpack_class.c b/msgpack_class.c
@@ -1,4 +1,3 @@
-
 #include "php.h"
 
 #include "php_msgpack.h"
@@ -104,7 +103,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgpack_base_unpacker, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static const zend_function_entry msgpack_base_methods[] = {
+static zend_function_entry msgpack_base_methods[] = {
     ZEND_ME(msgpack, __construct,
             arginfo_msgpack_base___construct, ZEND_ACC_PUBLIC)
     ZEND_ME(msgpack, setOption, arginfo_msgpack_base_setOption, ZEND_ACC_PUBLIC)
@@ -153,7 +152,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgpack_unpacker_reset, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static const zend_function_entry msgpack_unpacker_methods[] = {
+static zend_function_entry msgpack_unpacker_methods[] = {
     ZEND_ME(msgpack_unpacker, __construct,
             arginfo_msgpack_unpacker___construct, ZEND_ACC_PUBLIC)
     ZEND_ME(msgpack_unpacker, __destruct,
diff --git a/msgpack_unpack.c b/msgpack_unpack.c
@@ -474,7 +474,7 @@ int msgpack_unserialize_raw(
     }
     else
     {
-        ZVAL_STRINGL(*obj, data, len, 1);
+        ZVAL_STRINGL(*obj, (char *)data, len, 1);
     }
 
     return 0;
diff --git a/php_msgpack.h b/php_msgpack.h
@@ -1,10 +1,9 @@
-
 #ifndef PHP_MSGPACK_H
 #define PHP_MSGPACK_H
 
-#define MSGPACK_EXTENSION_VERSION "0.5.2"
+#include "ext/standard/php_smart_str.h" /* for smart_str */
 
-#include "ext/standard/php_smart_str.h"
+#define MSGPACK_EXTENSION_VERSION "0.5.2"
 
 extern zend_module_entry msgpack_module_entry;
 #define phpext_msgpack_ptr &msgpack_module_entry

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ int msgpack_unserialize_raw(`
`474`	`474`	`}`
`475`	`475`	`else`
`476`	`476`	`{`
`477`		`- ZVAL_STRINGL(*obj, data, len, 1);`
	`477`	`+ ZVAL_STRINGL(obj, (char )data, len, 1);`
`478`	`478`	`}`
`479`	`479`
`480`	`480`	`return 0;`