diff options
author | Thies C. Arntzen <thies@php.net> | 2001-10-25 06:51:13 +0000 |
---|---|---|
committer | Thies C. Arntzen <thies@php.net> | 2001-10-25 06:51:13 +0000 |
commit | 2977edaacdc1892ddc006654cb50df74f45a39a5 (patch) | |
tree | fa17fdde4bb22c051c0142cb5963a40750ceb144 | |
parent | 18ccd87eb97a2262bd9785421f199b6b3bf242e2 (diff) | |
download | php-git-2977edaacdc1892ddc006654cb50df74f45a39a5.tar.gz |
make it compile again and nuke most warnings
-rw-r--r-- | ext/rpc/xmlrpc/libxmlrpc/xml_element.h | 2 | ||||
-rw-r--r-- | ext/rpc/xmlrpc/libxmlrpc/xmlrpc.h | 14 | ||||
-rw-r--r-- | ext/rpc/xmlrpc/xmlrpc-epi-php.c | 29 | ||||
-rw-r--r-- | ext/xmlrpc/libxmlrpc/xml_element.h | 2 | ||||
-rw-r--r-- | ext/xmlrpc/libxmlrpc/xmlrpc.h | 14 | ||||
-rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 29 |
6 files changed, 52 insertions, 38 deletions
diff --git a/ext/rpc/xmlrpc/libxmlrpc/xml_element.h b/ext/rpc/xmlrpc/libxmlrpc/xml_element.h index bf4f3a8ba4..cfe7ca2483 100644 --- a/ext/rpc/xmlrpc/libxmlrpc/xml_element.h +++ b/ext/rpc/xmlrpc/libxmlrpc/xml_element.h @@ -158,7 +158,7 @@ typedef struct _xml_element { void xml_elem_free(xml_element* root); void xml_elem_free_non_recurse(xml_element* root); -xml_element* xml_elem_new(); +xml_element* xml_elem_new(void); char* xml_elem_serialize_to_string(xml_element *el, XML_ELEM_OUTPUT_OPTIONS options, int *buf_len); void xml_elem_serialize_to_stream(xml_element *el, FILE *output, XML_ELEM_OUTPUT_OPTIONS options); xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTIONS options, XML_ELEM_ERROR error); diff --git a/ext/rpc/xmlrpc/libxmlrpc/xmlrpc.h b/ext/rpc/xmlrpc/libxmlrpc/xmlrpc.h index 25ca90f3c5..c7223adf2e 100644 --- a/ext/rpc/xmlrpc/libxmlrpc/xmlrpc.h +++ b/ext/rpc/xmlrpc/libxmlrpc/xmlrpc.h @@ -274,9 +274,9 @@ typedef XMLRPC_VALUE (*XMLRPC_Callback)(XMLRPC_SERVER server, XMLRPC_REQUEST inp /******/ /* ID Case Defaults */ -XMLRPC_CASE XMLRPC_GetDefaultIdCase(); +XMLRPC_CASE XMLRPC_GetDefaultIdCase(void); XMLRPC_CASE XMLRPC_SetDefaultIdCase(XMLRPC_CASE id_case); -XMLRPC_CASE_COMPARISON XMLRPC_GetDefaultIdCaseComparison(); +XMLRPC_CASE_COMPARISON XMLRPC_GetDefaultIdCaseComparison(void); XMLRPC_CASE_COMPARISON XMLRPC_SetDefaultIdCaseComparison(XMLRPC_CASE_COMPARISON id_case); /* Vector manipulation */ @@ -298,7 +298,7 @@ XMLRPC_VALUE XMLRPC_CreateValueDateTime_ISO8601(const char* id, const char *s); XMLRPC_VALUE XMLRPC_CreateValueDouble(const char* id, double f); XMLRPC_VALUE XMLRPC_CreateValueInt(const char* id, int i); XMLRPC_VALUE XMLRPC_CreateValueString(const char* id, const char* s, int len); -XMLRPC_VALUE XMLRPC_CreateValueEmpty(); +XMLRPC_VALUE XMLRPC_CreateValueEmpty(void); XMLRPC_VALUE XMLRPC_CreateVector(const char* id, XMLRPC_VECTOR_TYPE type); /* Cleanup values */ @@ -340,7 +340,7 @@ char* XMLRPC_VALUE_ToXML(XMLRPC_VALUE val, int* buf_len); /* Request manipulation funcs */ const char* XMLRPC_RequestSetMethodName(XMLRPC_REQUEST request, const char* methodName); const char* XMLRPC_RequestGetMethodName(XMLRPC_REQUEST request); -XMLRPC_REQUEST XMLRPC_RequestNew(); +XMLRPC_REQUEST XMLRPC_RequestNew(void); void XMLRPC_RequestFree(XMLRPC_REQUEST request, int bFreeIO); XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestSetOutputOptions(XMLRPC_REQUEST request, XMLRPC_REQUEST_OUTPUT_OPTIONS output); XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestGetOutputOptions(XMLRPC_REQUEST request); @@ -350,8 +350,8 @@ XMLRPC_REQUEST_TYPE XMLRPC_RequestSetRequestType(XMLRPC_REQUEST request, XMLRPC_ XMLRPC_REQUEST_TYPE XMLRPC_RequestGetRequestType(XMLRPC_REQUEST request); /* Server Creation/Destruction; Method Registration and Invocation */ -XMLRPC_SERVER XMLRPC_ServerCreate(); -XMLRPC_SERVER XMLRPC_GetGlobalServer(); /* better to use XMLRPC_ServerCreate if you can */ +XMLRPC_SERVER XMLRPC_ServerCreate(void); +XMLRPC_SERVER XMLRPC_GetGlobalServer(void); /* better to use XMLRPC_ServerCreate if you can */ void XMLRPC_ServerDestroy(XMLRPC_SERVER server); int XMLRPC_ServerRegisterMethod(XMLRPC_SERVER server, const char *name, XMLRPC_Callback cb); XMLRPC_Callback XMLRPC_ServerFindMethod(XMLRPC_SERVER server, const char* callName); @@ -362,7 +362,7 @@ XMLRPC_VALUE XMLRPC_ServerCallMethod(XMLRPC_SERVER server, XMLRPC_REQUEST reques /* Public Utility funcs */ XMLRPC_VALUE XMLRPC_UtilityCreateFault(int fault_code, const char* fault_string); void XMLRPC_Free(void* mem); -const char* XMLRPC_GetVersionString(); +const char* XMLRPC_GetVersionString(void); /****d* VALUE/XMLRPC_MACROS * NAME diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c index c5323fd1db..20d8e688b6 100644 --- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c +++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c @@ -53,6 +53,7 @@ */ #include "php.h" +#include "ext/standard/info.h" #include "php_ini.h" #include "php_xmlrpc.h" #include "xmlrpc.h" @@ -178,6 +179,12 @@ typedef struct _xmlrpc_callback_data { ***********************/ XMLRPC_VALUE_TYPE get_pval_xmlrpc_type(pval* value, pval** newvalue); static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data); +int sset_pval_xmlrpc_type(pval* value, XMLRPC_VALUE_TYPE type); +pval* decode_request_worker(pval* xml_in, pval* encoding_in, pval* method_name_out); +const char* xmlrpc_type_as_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype); +XMLRPC_VALUE_TYPE xmlrpc_str_as_type(const char* str); +XMLRPC_VECTOR_TYPE xmlrpc_str_as_vector_type(const char* str); +int set_pval_xmlrpc_type(pval* value, XMLRPC_VALUE_TYPE type); /********************* * startup / shutdown * @@ -206,7 +213,7 @@ static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc) { } } -static void xmlrpc_init_globals(TSRMLS_D) +static void xmlrpc_init_globals(php_xmlrpc_globals *xmlrpc_globals) { return; } @@ -267,6 +274,7 @@ PHP_MINFO_FUNCTION(xmlrpc) /* Utility functions for adding data types to arrays, with or without key (assoc, non-assoc). * Could easily be further generalized to work with objects. */ +#if 0 static int add_long(pval* list, char* id, int num) { if(id) return add_assoc_long(list, id, num); else return add_next_index_long(list, num); @@ -287,6 +295,8 @@ static int add_stringl(pval* list, char* id, char* string, uint length, int dupl else return add_next_index_stringl(list, string, length, duplicate); } +#endif + static int add_pval(pval* list, const char* id, pval** val) { if(list && val) { if(id) return zend_hash_update(Z_ARRVAL_P(list), (char*)id, strlen(id)+1, (void *) val, sizeof(pval **), NULL); @@ -552,7 +562,6 @@ static XMLRPC_VALUE PHP_to_XMLRPC(pval* root_val) { /* recursively convert xmlrpc values into php values */ static pval* XMLRPC_to_PHP(XMLRPC_VALUE el) { pval* elem = NULL; - char* pBuf; const char* pStr; if(el) { @@ -664,8 +673,7 @@ PHP_FUNCTION(xmlrpc_encode_request) { PHP_FUNCTION(xmlrpc_encode) { XMLRPC_VALUE xOut = NULL; - pval* arg1, *out_opts; - php_output_options out; + pval* arg1; char* outBuf; if( !(ARG_COUNT(ht) == 1) || @@ -697,7 +705,7 @@ PHP_FUNCTION(xmlrpc_encode) pval* decode_request_worker(pval* xml_in, pval* encoding_in, pval* method_name_out) { pval* retval = NULL; XMLRPC_REQUEST response; - STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {0}; + STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {{0}}; opts.xml_elem_opts.encoding = encoding_in ? utf8_get_encoding_id_from_string(Z_STRVAL_P(encoding_in)) : ENCODING_DEFAULT; /* generate XMLRPC_REQUEST from raw xml */ @@ -844,7 +852,6 @@ PHP_FUNCTION(xmlrpc_server_destroy) { * it then calls the corresponding PHP function to handle the method. */ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRequest, void* data) { - pval *retval_ptr; xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data; pval* xmlrpc_params; pval* callback_params[3]; @@ -971,7 +978,7 @@ PHP_FUNCTION(xmlrpc_server_register_method) { Register a PHP function to generate documentation */ PHP_FUNCTION(xmlrpc_server_register_introspection_callback) { - pval* method_key, *method_name, *handle, *method_name_save; + pval* method_name, *handle, *method_name_save; int type; xmlrpc_server_data* server; @@ -1045,7 +1052,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) { /* check if we have a method name -- indicating success and all manner of good things */ if(XMLRPC_RequestGetMethodName(xRequest)) { - pval** php_function, *returned = NULL; + pval** php_function; XMLRPC_VALUE xAnswer = NULL; MAKE_STD_ZVAL(data.xmlrpc_method); /* init. very important. spent a frustrating day finding this out. */ MAKE_STD_ZVAL(data.return_data); @@ -1136,7 +1143,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) { Adds introspection documentation */ PHP_FUNCTION(xmlrpc_server_add_introspection_data) { - pval *method, *handle, *desc; + pval *handle, *desc; int type; xmlrpc_server_data* server; @@ -1163,7 +1170,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) { Decodes XML into a list of method descriptions */ PHP_FUNCTION(xmlrpc_parse_method_descriptions) { - pval* arg1, *arg2, *retval; + pval* arg1, *retval; if( !(ARG_COUNT(ht) == 1) || getParameters(ht, ARG_COUNT(ht), &arg1) == FAILURE) { WRONG_PARAM_COUNT; /* prints/logs a warning and returns */ @@ -1209,7 +1216,7 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions) #define TYPE_STR_MAP_SIZE (XMLRPC_TYPE_COUNT + XMLRPC_VECTOR_TYPE_COUNT) /* return a string matching a given xmlrpc type */ -static const char** get_type_str_mapping() { +static const char** get_type_str_mapping(void) { static const char* str_mapping[TYPE_STR_MAP_SIZE]; static int first = 1; if(first) { diff --git a/ext/xmlrpc/libxmlrpc/xml_element.h b/ext/xmlrpc/libxmlrpc/xml_element.h index bf4f3a8ba4..cfe7ca2483 100644 --- a/ext/xmlrpc/libxmlrpc/xml_element.h +++ b/ext/xmlrpc/libxmlrpc/xml_element.h @@ -158,7 +158,7 @@ typedef struct _xml_element { void xml_elem_free(xml_element* root); void xml_elem_free_non_recurse(xml_element* root); -xml_element* xml_elem_new(); +xml_element* xml_elem_new(void); char* xml_elem_serialize_to_string(xml_element *el, XML_ELEM_OUTPUT_OPTIONS options, int *buf_len); void xml_elem_serialize_to_stream(xml_element *el, FILE *output, XML_ELEM_OUTPUT_OPTIONS options); xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTIONS options, XML_ELEM_ERROR error); diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.h b/ext/xmlrpc/libxmlrpc/xmlrpc.h index 25ca90f3c5..c7223adf2e 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.h @@ -274,9 +274,9 @@ typedef XMLRPC_VALUE (*XMLRPC_Callback)(XMLRPC_SERVER server, XMLRPC_REQUEST inp /******/ /* ID Case Defaults */ -XMLRPC_CASE XMLRPC_GetDefaultIdCase(); +XMLRPC_CASE XMLRPC_GetDefaultIdCase(void); XMLRPC_CASE XMLRPC_SetDefaultIdCase(XMLRPC_CASE id_case); -XMLRPC_CASE_COMPARISON XMLRPC_GetDefaultIdCaseComparison(); +XMLRPC_CASE_COMPARISON XMLRPC_GetDefaultIdCaseComparison(void); XMLRPC_CASE_COMPARISON XMLRPC_SetDefaultIdCaseComparison(XMLRPC_CASE_COMPARISON id_case); /* Vector manipulation */ @@ -298,7 +298,7 @@ XMLRPC_VALUE XMLRPC_CreateValueDateTime_ISO8601(const char* id, const char *s); XMLRPC_VALUE XMLRPC_CreateValueDouble(const char* id, double f); XMLRPC_VALUE XMLRPC_CreateValueInt(const char* id, int i); XMLRPC_VALUE XMLRPC_CreateValueString(const char* id, const char* s, int len); -XMLRPC_VALUE XMLRPC_CreateValueEmpty(); +XMLRPC_VALUE XMLRPC_CreateValueEmpty(void); XMLRPC_VALUE XMLRPC_CreateVector(const char* id, XMLRPC_VECTOR_TYPE type); /* Cleanup values */ @@ -340,7 +340,7 @@ char* XMLRPC_VALUE_ToXML(XMLRPC_VALUE val, int* buf_len); /* Request manipulation funcs */ const char* XMLRPC_RequestSetMethodName(XMLRPC_REQUEST request, const char* methodName); const char* XMLRPC_RequestGetMethodName(XMLRPC_REQUEST request); -XMLRPC_REQUEST XMLRPC_RequestNew(); +XMLRPC_REQUEST XMLRPC_RequestNew(void); void XMLRPC_RequestFree(XMLRPC_REQUEST request, int bFreeIO); XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestSetOutputOptions(XMLRPC_REQUEST request, XMLRPC_REQUEST_OUTPUT_OPTIONS output); XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestGetOutputOptions(XMLRPC_REQUEST request); @@ -350,8 +350,8 @@ XMLRPC_REQUEST_TYPE XMLRPC_RequestSetRequestType(XMLRPC_REQUEST request, XMLRPC_ XMLRPC_REQUEST_TYPE XMLRPC_RequestGetRequestType(XMLRPC_REQUEST request); /* Server Creation/Destruction; Method Registration and Invocation */ -XMLRPC_SERVER XMLRPC_ServerCreate(); -XMLRPC_SERVER XMLRPC_GetGlobalServer(); /* better to use XMLRPC_ServerCreate if you can */ +XMLRPC_SERVER XMLRPC_ServerCreate(void); +XMLRPC_SERVER XMLRPC_GetGlobalServer(void); /* better to use XMLRPC_ServerCreate if you can */ void XMLRPC_ServerDestroy(XMLRPC_SERVER server); int XMLRPC_ServerRegisterMethod(XMLRPC_SERVER server, const char *name, XMLRPC_Callback cb); XMLRPC_Callback XMLRPC_ServerFindMethod(XMLRPC_SERVER server, const char* callName); @@ -362,7 +362,7 @@ XMLRPC_VALUE XMLRPC_ServerCallMethod(XMLRPC_SERVER server, XMLRPC_REQUEST reques /* Public Utility funcs */ XMLRPC_VALUE XMLRPC_UtilityCreateFault(int fault_code, const char* fault_string); void XMLRPC_Free(void* mem); -const char* XMLRPC_GetVersionString(); +const char* XMLRPC_GetVersionString(void); /****d* VALUE/XMLRPC_MACROS * NAME diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index c5323fd1db..20d8e688b6 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -53,6 +53,7 @@ */ #include "php.h" +#include "ext/standard/info.h" #include "php_ini.h" #include "php_xmlrpc.h" #include "xmlrpc.h" @@ -178,6 +179,12 @@ typedef struct _xmlrpc_callback_data { ***********************/ XMLRPC_VALUE_TYPE get_pval_xmlrpc_type(pval* value, pval** newvalue); static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data); +int sset_pval_xmlrpc_type(pval* value, XMLRPC_VALUE_TYPE type); +pval* decode_request_worker(pval* xml_in, pval* encoding_in, pval* method_name_out); +const char* xmlrpc_type_as_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype); +XMLRPC_VALUE_TYPE xmlrpc_str_as_type(const char* str); +XMLRPC_VECTOR_TYPE xmlrpc_str_as_vector_type(const char* str); +int set_pval_xmlrpc_type(pval* value, XMLRPC_VALUE_TYPE type); /********************* * startup / shutdown * @@ -206,7 +213,7 @@ static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc) { } } -static void xmlrpc_init_globals(TSRMLS_D) +static void xmlrpc_init_globals(php_xmlrpc_globals *xmlrpc_globals) { return; } @@ -267,6 +274,7 @@ PHP_MINFO_FUNCTION(xmlrpc) /* Utility functions for adding data types to arrays, with or without key (assoc, non-assoc). * Could easily be further generalized to work with objects. */ +#if 0 static int add_long(pval* list, char* id, int num) { if(id) return add_assoc_long(list, id, num); else return add_next_index_long(list, num); @@ -287,6 +295,8 @@ static int add_stringl(pval* list, char* id, char* string, uint length, int dupl else return add_next_index_stringl(list, string, length, duplicate); } +#endif + static int add_pval(pval* list, const char* id, pval** val) { if(list && val) { if(id) return zend_hash_update(Z_ARRVAL_P(list), (char*)id, strlen(id)+1, (void *) val, sizeof(pval **), NULL); @@ -552,7 +562,6 @@ static XMLRPC_VALUE PHP_to_XMLRPC(pval* root_val) { /* recursively convert xmlrpc values into php values */ static pval* XMLRPC_to_PHP(XMLRPC_VALUE el) { pval* elem = NULL; - char* pBuf; const char* pStr; if(el) { @@ -664,8 +673,7 @@ PHP_FUNCTION(xmlrpc_encode_request) { PHP_FUNCTION(xmlrpc_encode) { XMLRPC_VALUE xOut = NULL; - pval* arg1, *out_opts; - php_output_options out; + pval* arg1; char* outBuf; if( !(ARG_COUNT(ht) == 1) || @@ -697,7 +705,7 @@ PHP_FUNCTION(xmlrpc_encode) pval* decode_request_worker(pval* xml_in, pval* encoding_in, pval* method_name_out) { pval* retval = NULL; XMLRPC_REQUEST response; - STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {0}; + STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {{0}}; opts.xml_elem_opts.encoding = encoding_in ? utf8_get_encoding_id_from_string(Z_STRVAL_P(encoding_in)) : ENCODING_DEFAULT; /* generate XMLRPC_REQUEST from raw xml */ @@ -844,7 +852,6 @@ PHP_FUNCTION(xmlrpc_server_destroy) { * it then calls the corresponding PHP function to handle the method. */ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRequest, void* data) { - pval *retval_ptr; xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data; pval* xmlrpc_params; pval* callback_params[3]; @@ -971,7 +978,7 @@ PHP_FUNCTION(xmlrpc_server_register_method) { Register a PHP function to generate documentation */ PHP_FUNCTION(xmlrpc_server_register_introspection_callback) { - pval* method_key, *method_name, *handle, *method_name_save; + pval* method_name, *handle, *method_name_save; int type; xmlrpc_server_data* server; @@ -1045,7 +1052,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) { /* check if we have a method name -- indicating success and all manner of good things */ if(XMLRPC_RequestGetMethodName(xRequest)) { - pval** php_function, *returned = NULL; + pval** php_function; XMLRPC_VALUE xAnswer = NULL; MAKE_STD_ZVAL(data.xmlrpc_method); /* init. very important. spent a frustrating day finding this out. */ MAKE_STD_ZVAL(data.return_data); @@ -1136,7 +1143,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) { Adds introspection documentation */ PHP_FUNCTION(xmlrpc_server_add_introspection_data) { - pval *method, *handle, *desc; + pval *handle, *desc; int type; xmlrpc_server_data* server; @@ -1163,7 +1170,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) { Decodes XML into a list of method descriptions */ PHP_FUNCTION(xmlrpc_parse_method_descriptions) { - pval* arg1, *arg2, *retval; + pval* arg1, *retval; if( !(ARG_COUNT(ht) == 1) || getParameters(ht, ARG_COUNT(ht), &arg1) == FAILURE) { WRONG_PARAM_COUNT; /* prints/logs a warning and returns */ @@ -1209,7 +1216,7 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions) #define TYPE_STR_MAP_SIZE (XMLRPC_TYPE_COUNT + XMLRPC_VECTOR_TYPE_COUNT) /* return a string matching a given xmlrpc type */ -static const char** get_type_str_mapping() { +static const char** get_type_str_mapping(void) { static const char* str_mapping[TYPE_STR_MAP_SIZE]; static int first = 1; if(first) { |