From: Ilia Alshanetsky Date: Tue, 27 Apr 2004 17:34:05 +0000 (+0000) Subject: MFH: Removed C++ style comments. X-Git-Tag: php-4.3.7RC1~56 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7de0f803d1b59abec2f84bffcd9e374771bb7321;p=php MFH: Removed C++ style comments. --- diff --git a/ext/com/COM.c b/ext/com/COM.c index e0027c0f35..10288ca734 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -1849,7 +1849,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer obj = obj_prop; php_COM_set(obj, &V_DISPATCH(var_result), TRUE TSRMLS_CC); - VariantInit(var_result); // to protect C_DISPATCH(obj) from being freed when var_result is destructed + VariantInit(var_result); /* to protect C_DISPATCH(obj) from being freed when var_result is destructed */ } else { php_variant_to_pval(var_result, &retval, codepage TSRMLS_CC); @@ -1934,7 +1934,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere return FAILURE; } - VariantInit(var_result); // to protect C_DISPATCH(obj) from being freed when var_result is destructed + VariantInit(var_result); /* to protect C_DISPATCH(obj) from being freed when var_result is destructed */ zval_dtor(&overloaded_property->element); } FREE_VARIANT(var_result); diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c index 6febf65c96..64fbe5b826 100644 --- a/ext/com/VARIANT.c +++ b/ext/com/VARIANT.c @@ -181,7 +181,7 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r case OE_IS_OBJECT: if (!strcmp(Z_STRVAL(overloaded_property->element), "value")) { - // var_arg can't be an idispatch, so we don't care for the implicit AddRef() call here + /* var_arg can't be an idispatch, so we don't care for the implicit AddRef() call here */ php_variant_to_pval(var_arg, &result, codepage TSRMLS_CC); } else if (!strcmp(Z_STRVAL(overloaded_property->element), "type")) { ZVAL_LONG(&result, V_VT(var_arg)) diff --git a/ext/com/conversion.c b/ext/com/conversion.c index 2c050f49ae..ea8e31bce6 100644 --- a/ext/com/conversion.c +++ b/ext/com/conversion.c @@ -119,7 +119,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, VARTYPE ty var_arg = V_VARIANTREF(var_arg); /* put the array in that VARIANT */ } if (!type) { - // if no type is given we take the variant type + /* if no type is given we take the variant type */ type = VT_VARIANT; } diff --git a/ext/com/dispatch.c b/ext/com/dispatch.c index b7b70c3f31..a176b4c449 100644 --- a/ext/com/dispatch.c +++ b/ext/com/dispatch.c @@ -280,7 +280,7 @@ static HRESULT STDMETHODCALLTYPE disp_invokeex( ZVAL_NULL(zarg); } } else { - // arg can't be an idispatch, so we don't care for the implicit AddRef() call here + /* arg can't be an idispatch, so we don't care for the implicit AddRef() call here */ if (FAILURE == php_variant_to_pval(arg, zarg, codepage TSRMLS_CC)) { trace("failed to convert arg %d to zval\n", i); ZVAL_NULL(zarg); diff --git a/ext/notes/php_notes.c b/ext/notes/php_notes.c index 16a459ceb1..aa59b59daf 100644 --- a/ext/notes/php_notes.c +++ b/ext/notes/php_notes.c @@ -1912,14 +1912,14 @@ PHP_FUNCTION(notes_search) pNoteID = (NOTEID *) (((char *) pSearchResults) + sizeof(FT_SEARCH_RESULTS)); - //pSearchResults->NumHits + /* pSearchResults->NumHits */ array_init(return_value); pScores = (BYTE *) (pNoteID + pSearchResults->NumHits); for (i = 0; i < pSearchResults->NumHits; i++, pNoteID++, pScores++){ add_next_index_long(return_value, (long) *pNoteID ); - //RETVAL_LONG( (long) *pNoteID ); + /* RETVAL_LONG( (long) *pNoteID ); */ } OSUnlockObject (SearchResults_handle); diff --git a/ext/xmlrpc/libxmlrpc/base64.c b/ext/xmlrpc/libxmlrpc/base64.c index 6ae8b73c08..7788d028d7 100644 --- a/ext/xmlrpc/libxmlrpc/base64.c +++ b/ext/xmlrpc/libxmlrpc/base64.c @@ -104,13 +104,13 @@ void base64_encode(struct buffer_st *b, const char *source, int length) for (i = 0; i < 4; i++) { buffer_add(b, ogroup[i]); if (!(b->offset % 72)) { - // buffer_add(b, '\r'); + /* buffer_add(b, '\r'); */ buffer_add(b, '\n'); } } } } - // buffer_add(b, '\r'); + /* buffer_add(b, '\r'); */ buffer_add(b, '\n'); } diff --git a/ext/xmlrpc/libxmlrpc/queue.h b/ext/xmlrpc/libxmlrpc/queue.h index e850b57e6c..be73f6da00 100644 --- a/ext/xmlrpc/libxmlrpc/queue.h +++ b/ext/xmlrpc/libxmlrpc/queue.h @@ -76,8 +76,8 @@ q_iter Q_Iter_Tail(queue *q); q_iter Q_Iter_Next(q_iter qi); q_iter Q_Iter_Prev(q_iter qi); void* Q_Iter_Get(q_iter qi); -int Q_Iter_Put(q_iter qi, void* data); // not read only! here for completeness. -void* Q_Iter_Del(queue *q, q_iter iter); // not read only! here for completeness. +int Q_Iter_Put(q_iter qi, void* data); /* not read only! here for completeness. */ +void* Q_Iter_Del(queue *q, q_iter iter); /* not read only! here for completeness. */ /* Fast (macro'd) versions of above */ #define Q_Iter_Head_F(q) (q ? (q_iter)((queue*)q)->head : NULL) diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c index a09131aad6..8390f06e8e 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -59,8 +59,7 @@ static const char rcsid[] = "#(@) $Id:"; #define TOKEN_SOAP_FAULTACTOR "actor" -// determine if a string represents a soap type, as used in -// element names +/* determine if a string represents a soap type, as used in element names */ static inline int is_soap_type(const char* soap_type) { return(strstr(soap_type, "SOAP-ENC:") || strstr(soap_type, "xsd:")) ? 1 : 0; } @@ -199,25 +198,25 @@ static XMLRPC_VALUE gen_fault_xmlrpc(XMLRPC_VALUE node, xml_element* el_target) /* rough mapping of xmlrpc fault codes to soap codes */ switch (XMLRPC_GetValueInt(xCode)) { - case -32700: // "parse error. not well formed", - case -32701: // "parse error. unsupported encoding" - case -32702: // "parse error. invalid character for encoding" - case -32600: // "server error. invalid xml-rpc. not conforming to spec." - case -32601: // "server error. requested method not found" - case -32602: // "server error. invalid method parameters" + case -32700: /* "parse error. not well formed", */ + case -32701: /* "parse error. unsupported encoding" */ + case -32702: /* "parse error. invalid character for encoding" */ + case -32600: /* "server error. invalid xml-rpc. not conforming to spec." */ + case -32601: /* "server error. requested method not found" */ + case -32602: /* "server error. invalid method parameters" */ XMLRPC_SetValueString(xCode, "SOAP-ENV:Client", 0); break; - case -32603: // "server error. internal xml-rpc error" - case -32500: // "application error" - case -32400: // "system error" - case -32300: // "transport error + case -32603: /* "server error. internal xml-rpc error" */ + case -32500: /* "application error" */ + case -32400: /* "system error" */ + case -32300: /* "transport error */ XMLRPC_SetValueString(xCode, "SOAP-ENV:Server", 0); break; } return xDup; } -// returns a new XMLRPC_VALUE representing a soap fault, comprised of a struct with four keys. +/* returns a new XMLRPC_VALUE representing a soap fault, comprised of a struct with four keys. */ static XMLRPC_VALUE gen_soap_fault(const char* fault_code, const char* fault_string, const char* actor, const char* details) { XMLRPC_VALUE xReturn = XMLRPC_CreateVector(TOKEN_FAULT, xmlrpc_vector_struct); @@ -239,63 +238,63 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, int depth) { XMLRPC_REQUEST_TYPE rtype = xmlrpc_request_none; - // no current element on first call + /* no current element on first call */ if (!xCurrent) { xCurrent = XMLRPC_CreateValueEmpty(); } - // increment recursion depth guage + /* increment recursion depth guage */ depth ++; - // safety first. must have a valid element + /* safety first. must have a valid element */ if (el && el->name) { const char* id = NULL; const char* type = NULL, *arrayType=NULL, *actor = NULL; xml_element_attr* attr_iter = Q_Head(&el->attrs); int b_must_understand = 0; - // in soap, types may be specified in either element name -or- with xsi:type attribute. + /* in soap, types may be specified in either element name -or- with xsi:type attribute. */ if (is_soap_type(el->name)) { type = el->name; } - // if our parent node, by definition a vector, is not an array, then - // our element name must be our key identifier. + /* if our parent node, by definition a vector, is not an array, then + our element name must be our key identifier. */ else if (XMLRPC_GetVectorType(xParent) != xmlrpc_vector_array) { id = el->name; if(!strcmp(id, "item")) { } } - // iterate through element attributes, pick out useful stuff. + /* iterate through element attributes, pick out useful stuff. */ while (attr_iter) { - // element's type + /* element's type */ if (!strcmp(attr_iter->key, TOKEN_TYPE)) { type = attr_iter->val; } - // array type + /* array type */ else if (!strcmp(attr_iter->key, TOKEN_ARRAY_TYPE)) { arrayType = attr_iter->val; } - // must understand, sometimes present in headers. + /* must understand, sometimes present in headers. */ else if (!strcmp(attr_iter->key, TOKEN_MUSTUNDERSTAND)) { b_must_understand = strchr(attr_iter->val, '1') ? 1 : 0; } - // actor, used in conjuction with must understand. + /* actor, used in conjuction with must understand. */ else if (!strcmp(attr_iter->key, TOKEN_ACTOR)) { actor = attr_iter->val; } attr_iter = Q_Next(&el->attrs); } - // check if caller says we must understand something in a header. + /* check if caller says we must understand something in a header. */ if (b_must_understand) { - // is must understand actually indended for us? - // BUG: spec says we should also determine if actor is our URL, but - // we do not have that information. + /* is must understand actually indended for us? + BUG: spec says we should also determine if actor is our URL, but + we do not have that information. */ if (!actor || !strcmp(actor, TOKEN_ACTOR_NEXT)) { - // TODO: implement callbacks or other mechanism for applications - // to "understand" these headers. For now, we just bail if we - // get a mustUnderstand header intended for us. + /* TODO: implement callbacks or other mechanism for applications + to "understand" these headers. For now, we just bail if we + get a mustUnderstand header intended for us. */ XMLRPC_RequestSetError(request, gen_soap_fault("SOAP-ENV:MustUnderstand", "SOAP Must Understand Error", @@ -304,21 +303,21 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, } } - // set id (key) if one was found. + /* set id (key) if one was found. */ if (id) { XMLRPC_SetValueID_Case(xCurrent, id, 0, xmlrpc_case_exact); } - // according to soap spec, - // depth 1 = Envelope, 2 = Header, Body & Fault, 3 = methodcall or response. + /* according to soap spec, + depth 1 = Envelope, 2 = Header, Body & Fault, 3 = methodcall or response. */ if (depth == 3) { const char* methodname = el->name; char* p = NULL; - // BUG: we determine request or response type using presence of "Response" in element name. - // According to spec, this is only recommended, not required. Apparently, implementations - // are supposed to know the type of action based on state, which strikes me as a bit lame. - // Anyway, we don't have that state info, thus we use Response as a heuristic. + /* BUG: we determine request or response type using presence of "Response" in element name. + According to spec, this is only recommended, not required. Apparently, implementations + are supposed to know the type of action based on state, which strikes me as a bit lame. + Anyway, we don't have that state info, thus we use Response as a heuristic. */ rtype = #ifdef strcasestr strcasestr(el->name, "response") ? xmlrpc_request_response : xmlrpc_request_call; @@ -327,7 +326,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, #endif XMLRPC_RequestSetRequestType(request, rtype); - // Get methodname. strip xml namespace crap. + /* Get methodname. strip xml namespace crap. */ p = strchr(el->name, ':'); if (p) { methodname = p + 1; @@ -338,8 +337,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, } - // Next, we begin to convert actual values. - // if no children, then must be a scalar value. + /* Next, we begin to convert actual values. if no children, then must be a scalar value. */ if (!Q_Size(&el->children)) { if (!type && parent_array && parent_array->kids_type[0]) { type = parent_array->kids_type; @@ -358,7 +356,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, XMLRPC_SetValueDouble(xCurrent, atof(el->text.str)); } else if (!strcmp(type, TOKEN_NULL)) { - // already an empty val. do nothing. + /* already an empty val. do nothing. */ } else if (!strcmp(type, TOKEN_DATETIME)) { XMLRPC_SetValueDateTime_ISO8601(xCurrent, el->text.str); @@ -370,7 +368,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, buffer_delete(&buf); } } - // Element has children, thus a vector, or "compound type" in soap-speak. + /* Element has children, thus a vector, or "compound type" in soap-speak. */ else { struct array_info* ai = NULL; xml_element* iter = (xml_element*)Q_Head(&el->children); @@ -379,27 +377,27 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, XMLRPC_SetIsVector(xCurrent, xmlrpc_vector_struct); } else if (!strcmp(type, TOKEN_ARRAY) || arrayType != NULL) { - // determine magic associated with soap array type. - // this is passed down as we recurse, so our children have access to the info. + /* determine magic associated with soap array type. + this is passed down as we recurse, so our children have access to the info. */ ai = parse_array_type_info(arrayType); // alloc'ed ai free'd below. XMLRPC_SetIsVector(xCurrent, xmlrpc_vector_array); } else { - // mixed is probably closest thing we have to compound type. + /* mixed is probably closest thing we have to compound type. */ XMLRPC_SetIsVector(xCurrent, xmlrpc_vector_mixed); } - // Recurse, adding values as we go. Check for error during recursion - // and if found, bail. this short-circuits us out of the recursion. + /* Recurse, adding values as we go. Check for error during recursion + and if found, bail. this short-circuits us out of the recursion. */ while ( iter && !XMLRPC_RequestGetError(request) ) { XMLRPC_VALUE xNext = NULL; - // top level elements don't actually represent values, so we just pass the - // current value along until we are deep enough. + /* top level elements don't actually represent values, so we just pass the + current value along until we are deep enough. */ if ( depth <= 2 || (rtype == xmlrpc_request_response && depth <= 3) ) { xml_element_to_SOAP_REQUEST_worker(request, NULL, ai, xCurrent, iter, depth); } - // ready to do some actual de-serialization. create a new empty value and - // pass that along to be init'd, then add it to our current vector. + /* ready to do some actual de-serialization. create a new empty value and + pass that along to be init'd, then add it to our current vector. */ else { xNext = XMLRPC_CreateValueEmpty(); xml_element_to_SOAP_REQUEST_worker(request, xCurrent, ai, xNext, iter, depth); @@ -407,7 +405,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, } iter = (xml_element*)Q_Next(&el->children); } - // cleanup + /* cleanup */ if (ai) { free(ai); } @@ -416,13 +414,13 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, return xCurrent; } -// Convert soap xml dom to XMLRPC_VALUE, sans request info. untested. +/* Convert soap xml dom to XMLRPC_VALUE, sans request info. untested. */ XMLRPC_VALUE xml_element_to_SOAP_VALUE(xml_element* el) { return xml_element_to_SOAP_REQUEST_worker(NULL, NULL, NULL, NULL, el, 0); } -// Convert soap xml dom to XMLRPC_REQUEST +/* Convert soap xml dom to XMLRPC_REQUEST */ XMLRPC_VALUE xml_element_to_SOAP_REQUEST(XMLRPC_REQUEST request, xml_element* el) { if (request) { @@ -442,7 +440,7 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod XMLRPC_VALUE_TYPE_EASY type = XMLRPC_GetValueTypeEasy(node); char* pName = NULL, *pAttrType = NULL; - // create our return value element + /* create our return value element */ elem_val = xml_elem_new(); switch (type) { @@ -450,14 +448,14 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod case xmlrpc_type_mixed: case xmlrpc_type_array: if (type == xmlrpc_type_array) { - // array's are _very_ special in soap. - // TODO: Should handle sparse/partial arrays here. + /* array's are _very_ special in soap. + TODO: Should handle sparse/partial arrays here. */ - // determine soap array type. + /* determine soap array type. */ const char* type = get_array_soap_type(node); xml_element_attr* attr_array_type = NULL; - // specify array kids type and array size. + /* specify array kids type and array size. */ snprintf(buf, sizeof(buf), "%s[%i]", type, XMLRPC_VectorSize(node)); attr_array_type = new_attr(TOKEN_ARRAY_TYPE, buf); @@ -465,14 +463,14 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod pAttrType = TOKEN_ARRAY; } - // check for fault, which is a rather special case. - // (can't these people design anything consistent/simple/elegant?) + /* check for fault, which is a rather special case. + (can't these people design anything consistent/simple/elegant?) */ else if (type == xmlrpc_type_struct) { int fault_type = get_fault_type(node); if (fault_type) { if (fault_type == 1) { - // gen fault from xmlrpc style fault codes - // notice that we get a new node, which must be freed herein. + /* gen fault from xmlrpc style fault codes + notice that we get a new node, which must be freed herein. */ node = gen_fault_xmlrpc(node, elem_val); bFreeNode = 1; } @@ -494,7 +492,7 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod break; - // handle scalar types + /* handle scalar types */ case xmlrpc_type_empty: pAttrType = TOKEN_NULL; break; @@ -541,25 +539,24 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod break; } - // determining element's name is a bit tricky, due to soap semantics. + /* determining element's name is a bit tricky, due to soap semantics. */ if (!pName) { - // if the value's type is known... + /* if the value's type is known... */ if (pAttrType) { - // see if it has an id (key). If so, use that as name, - // and type as an attribute. + /* see if it has an id (key). If so, use that as name, and type as an attribute. */ pName = (char*)XMLRPC_GetValueID(node); if (pName) { Q_PushTail(&elem_val->attrs, new_attr(TOKEN_TYPE, pAttrType)); } - // otherwise, use the type as the name. + /* otherwise, use the type as the name. */ else { pName = pAttrType; } } - // if the value's type is not known... (a rare case?) + /* if the value's type is not known... (a rare case?) */ else { - // see if it has an id (key). otherwise, default to generic "item" + /* see if it has an id (key). otherwise, default to generic "item" */ pName = (char*)XMLRPC_GetValueID(node); if (!pName) { pName = "item"; @@ -568,7 +565,7 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod } elem_val->name = strdup(pName); - // cleanup + /* cleanup */ if (bFreeNode) { XMLRPC_CleanupValue(node); } @@ -576,16 +573,16 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod return elem_val; } -// convert XMLRPC_VALUE to soap xml dom. untested. +/* convert XMLRPC_VALUE to soap xml dom. untested. */ xml_element* SOAP_VALUE_to_xml_element(XMLRPC_VALUE node) { return SOAP_to_xml_element_worker(NULL, node); } -// convert XMLRPC_REQUEST to soap xml dom. +/* convert XMLRPC_REQUEST to soap xml dom. */ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { xml_element* root = xml_elem_new(); - // safety first. + /* safety first. */ if (root) { xml_element* body = xml_elem_new(); root->name = strdup("SOAP-ENV:Envelope"); @@ -599,11 +596,11 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { Q_PushTail(&root->attrs, new_attr("xmlns:ns6", "http://testuri.org")); Q_PushTail(&root->attrs, new_attr("SOAP-ENV:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/")); - //Q_PushHead(&root->attrs, new_attr("xmlns:ks", "http://kitchen.sink.org/soap/everything/under/sun")); - // JUST KIDDING!! :-) ----> ------------------------------------------------- + /* Q_PushHead(&root->attrs, new_attr("xmlns:ks", "http://kitchen.sink.org/soap/everything/under/sun")); + JUST KIDDING!! :-) ----> ------------------------------------------------- */ if (body) { - // go ahead and serialize first... + /* go ahead and serialize first... */ xml_element* el_serialized = SOAP_to_xml_element_worker(request, XMLRPC_RequestGetData(request)); @@ -612,7 +609,7 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { if (el_serialized && !strcmp(el_serialized->name, TOKEN_FAULT)) { Q_PushTail(&body->children, el_serialized); } - // usual case: not a fault. Add Response element in between. + /* usual case: not a fault. Add Response element in between. */ else { xml_element* rpc = xml_elem_new(); @@ -620,15 +617,15 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { const char* methodname = XMLRPC_RequestGetMethodName(request); XMLRPC_REQUEST_TYPE rtype = XMLRPC_RequestGetRequestType(request); - // if we are making a request, we want to use the methodname as is. + /* if we are making a request, we want to use the methodname as is. */ if (rtype == xmlrpc_request_call) { if (methodname) { rpc->name = strdup(methodname); } } - // if it's a response, we append "Response". Also, given xmlrpc-epi - // API/architecture, it's likely that we don't have a methodname for - // the response, so we have to check that. + /* if it's a response, we append "Response". Also, given xmlrpc-epi + API/architecture, it's likely that we don't have a methodname for + the response, so we have to check that. */ else { char buf[128]; snprintf(buf, sizeof(buf), "%s%s", @@ -638,8 +635,8 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { rpc->name = strdup(buf); } - // add serialized data to method call/response. - // add method call/response to body element + /* add serialized data to method call/response. + add method call/response to body element */ if (rpc->name) { if(el_serialized) { if(Q_Size(&el_serialized->children) && rtype == xmlrpc_request_call) { @@ -658,8 +655,8 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { Q_PushTail(&body->children, rpc); } else { - // no method name?! - // TODO: fault here...? + /* no method name?! + TODO: fault here...? */ } } } diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c index c45d3ec3db..4caf9e3afd 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c @@ -209,7 +209,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA } else { switch (type) { - case xmlrpc_empty: // treat null value as empty string in xmlrpc. + case xmlrpc_empty: /* treat null value as empty string in xmlrpc. */ case xmlrpc_string: elem_val->name = strdup(ELEM_STRING); simplestring_addn(&elem_val->text, XMLRPC_GetValueString(node), XMLRPC_GetValueStringLen(node)); diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c index bb3e6e379b..cac364afa6 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c @@ -43,6 +43,9 @@ static const char rcsid[] = "#(@) $Id$"; * 9/1999 - 10/2000 * HISTORY * $Log$ + * Revision 1.4.4.1 2003/12/16 21:00:36 sniper + * MFH: fix compile warnings + * * Revision 1.4 2002/07/05 04:43:53 danda * merged in updates from SF project. bring php repository up to date with xmlrpc-epi version 0.51 * @@ -221,7 +224,7 @@ static int date_from_ISO8601 (const char *text, time_t * value) { static int date_to_ISO8601 (time_t value, char *buf, int length) { struct tm *tm; tm = localtime(&value); -#if 0 // TODO: soap seems to favor this method. xmlrpc the latter. +#if 0 /* TODO: soap seems to favor this method. xmlrpc the latter. */ return strftime (buf, length, "%Y-%m-%dT%H:%M:%SZ", tm); #else return strftime(buf, length, "%Y%m%dT%H:%M:%S", tm); @@ -987,7 +990,7 @@ int XMLRPC_SetIsVector(XMLRPC_VALUE value, XMLRPC_VECTOR_TYPE type) { int bSuccess = 0; if (value) { - // we can change the type so long as nothing is currently stored. + /* we can change the type so long as nothing is currently stored. */ if(value->type == xmlrpc_vector) { if(value->v) { if(!Q_Size(value->v->q)) {