Menu
▾
▴
[Xsb-commits] CVS: XSB/packages/libwww/cc libwww_util.h,1.10,1.11 libwww_request.c,1.14,1.15 libwww_parse_xml.c,1.14,1.15 libwww_parse_rdf.c,1.4,1.5 libwww_parse_html.c,1.11,1.12
|
From: Michael K. <ki...@us...> - 2003-12-31 01:04:55
|
Update of /cvsroot/xsb/XSB/packages/libwww/cc
In directory sc8-pr-cvs1:/tmp/cvs-serv6587/packages/libwww/cc
Modified Files:
libwww_util.h libwww_request.c libwww_parse_xml.c
libwww_parse_rdf.c libwww_parse_html.c
Log Message:
adjust libwww to the recent changes in the C interfaces, but the package is
still broken
Index: libwww_util.h
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/libwww/cc/libwww_util.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libwww_util.h 20 May 2000 06:56:17 -0000 1.10
+++ libwww_util.h 31 Dec 2003 01:04:51 -0000 1.11
@@ -60,6 +60,7 @@
#define LIBWWW_DEBUG_VERBOSE
#define LIBWWW_DEBUG
#define LIBWWW_DEBUG_TERSE
+#include "debug_xsb.h"
*/
#ifdef LIBWWW_DEBUG_VERBOSE
#define LIBWWW_DEBUG
Index: libwww_request.c
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/libwww/cc/libwww_request.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libwww_request.c 17 Mar 2001 05:44:01 -0000 1.14
+++ libwww_request.c 31 Dec 2003 01:04:51 -0000 1.15
@@ -108,8 +108,8 @@
HTTimer* timer = HTTimer_new(NULL, timer_cbf, NULL, 2*timeout_value, 1, 1);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In libwww_request: Starting event loop. Total requests=%d, timeout=%d",
- total_number_of_requests, timeout_value);
+ xsb_dbgmsg((LOG_DEBUG,"***In libwww_request: Starting event loop. Total requests=%d, timeout=%d",
+ total_number_of_requests, timeout_value));
#endif
HTTimer_dispatch(timer);
@@ -124,13 +124,13 @@
/* expiring remaining timers is VERY important in order to avoid them
kicking in at the wrong moment and killing subsequent requests */
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Expiring timers");
+ xsb_dbgmsg((LOG_DEBUG,"***Expiring timers"));
#endif
HTTimer_expireAll();
HTTimer_delete(timer);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In libwww_request: event loop ended: total outstanding requests=%d", total_number_of_requests);
+ xsb_dbgmsg((LOG_DEBUG,"***In libwww_request: event loop ended: total outstanding requests=%d", total_number_of_requests));
#endif
}
@@ -200,9 +200,9 @@
if (context->user_modtime > context->last_modtime) {
/* cleanup the request and don't start it */
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Request %s: Page older(%d) than if-modified-since time(%d)",
+ xsb_dbgmsg((LOG_DEBUG,"***Request %s: Page older(%d) than if-modified-since time(%d)",
RequestID(request),
- context->last_modtime, context->user_modtime);
+ context->last_modtime, context->user_modtime));
#endif
total_number_of_requests--;
@@ -290,31 +290,31 @@
#ifdef LIBWWW_DEBUG_TERSE
switch (context->type) {
case HTMLPARSE:
- xsb_dbgmsg("***Request %d: request type: htmlparse", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: request type: htmlparse", request_id));
break;
case XMLPARSE:
- xsb_dbgmsg("***Request %d: request type: xmlparse", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: request type: xmlparse", request_id));
break;
case RDFPARSE:
- xsb_dbgmsg("***Request %d: request type: rdfparse", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: request type: rdfparse", request_id));
break;
case HEADER:
- xsb_dbgmsg("***Request %d: request type: header", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: request type: header", request_id));
break;
case FETCH:
- xsb_dbgmsg("***Request %d: request type: fetch", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: request type: fetch", request_id));
break;
default:
- xsb_dbgmsg("***Request %d: request type: invalid", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: request type: invalid", request_id));
}
if (formdata)
- xsb_dbgmsg("***Request %d: HTTP Method: %s, preemptive: %d",
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: HTTP Method: %s, preemptive: %d",
request_id,
(context->method==METHOD_GET ? "FORM,GET" : "FORM,POST"),
- HTRequest_preemptive(request));
+ HTRequest_preemptive(request)));
else
- xsb_dbgmsg("***Request %d: HTTP Method: NON-FORM REQ, preemptive: %d",
- request_id, HTRequest_preemptive(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: HTTP Method: NON-FORM REQ, preemptive: %d",
+ request_id, HTRequest_preemptive(request)));
#endif
if (formdata) HTAssocList_delete(formdata);
@@ -322,8 +322,8 @@
/* bad uri syntax */
if (!status) {
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In setup_request_structure: Request %d failed: bad uri",
- request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***In setup_request_structure: Request %d failed: bad uri",
+ request_id));
#endif
total_number_of_requests--;
if (is_var(context->status_term))
@@ -351,8 +351,8 @@
{
REQUEST_CONTEXT *context = (REQUEST_CONTEXT *)HTRequest_context(request);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In handle_dependent_termination(%s): user_modtime=%d status=%d",
- RequestID(request), context->user_modtime, status);
+ xsb_dbgmsg((LOG_DEBUG,"***In handle_dependent_termination(%s): user_modtime=%d status=%d",
+ RequestID(request), context->user_modtime, status));
#endif
/* the following conditions are handled by standard libwww filters */
@@ -464,7 +464,7 @@
HTRequest_setContext(request, (void *) context);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Request %d: context set", request_id);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %d: context set", request_id));
#endif
return context;
@@ -513,7 +513,9 @@
prolog_term term2 = p2p_deref(term);
XSB_StrSet(&StrArgBuf,"");
print_pterm(term2, 1, &StrArgBuf);
- xsb_dbgmsg("***%s = %s", message, StrArgBuf.string);
+#ifdef LIBWWW_DEBUG
+ xsb_dbgmsg((LOG_DEBUG,"***%s = %s", message, StrArgBuf.string));
+#endif
}
@@ -541,8 +543,8 @@
AUTHENTICATION *credentials;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In libwww_send_credentials: Request=%s, realm: '%s' msgnum=%d",
- RequestID(request), realm, msgnum);
+ xsb_dbgmsg((LOG_DEBUG,"***In libwww_send_credentials: Request=%s, realm: '%s' msgnum=%d",
+ RequestID(request), realm, msgnum));
#endif
/* don't authenticate on retry */
@@ -579,7 +581,9 @@
PRIVATE char *extract_uri(prolog_term req_term, HTRequest *request,
int request_id)
{
+ /*
static XSB_StrDefine(uristr);
+ */
int urilen;
char *uri;
prolog_term uri_term;
@@ -587,8 +591,11 @@
uri_term=p2p_arg(req_term,1);
if (is_charlist(uri_term, &urilen)) {
((REQUEST_CONTEXT *)HTRequest_context(request))->convert2list=TRUE;
+ /*
p2c_chars(uri_term, &uristr);
uri = uristr.string;
+ */
+ p2c_chars(uri_term, uri, urilen);
} else if (is_string(uri_term))
uri=string_val(uri_term);
else {
@@ -891,8 +898,8 @@
USERDATA *userdata = (USERDATA *)(context->userdata);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Request %s: In request_termination_handler, status %d",
- RequestID(request), status);
+ xsb_dbgmsg((LOG_DEBUG,"***Request %s: In request_termination_handler, status %d",
+ RequestID(request), status));
#endif
/* the following conditions are handled by standard libwww filters */
@@ -920,8 +927,8 @@
HTEventList_stopLoop();
event_loop_runnung = FALSE;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In request_termination_handler: event loop halted, status=%d, HTNetCount=%d",
- status, HTNet_count());
+ xsb_dbgmsg((LOG_DEBUG,"***In request_termination_handler: event loop halted, status=%d, HTNetCount=%d",
+ status, HTNet_count()));
#endif
}
@@ -957,8 +964,8 @@
}
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In request_termination_handler: Cleanup: request %s, status=%d remaining requests: %d",
- RequestID(request), status, total_number_of_requests);
+ xsb_dbgmsg((LOG_DEBUG,"***In request_termination_handler: Cleanup: request %s, status=%d remaining requests: %d",
+ RequestID(request), status, total_number_of_requests));
#endif
release_libwww_request(request);
@@ -1026,7 +1033,7 @@
va_list ap;
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***Starting add_result_param");
+ xsb_dbgmsg((LOG_DEBUG,"***Starting add_result_param"));
#endif
XSB_Deref(*result_param);
@@ -1191,7 +1198,7 @@
the standard Libwww filters. */
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Subrequest %s: context set", RequestID(subrequest));
+ xsb_dbgmsg((LOG_DEBUG,"***Subrequest %s: context set", RequestID(subrequest)));
#endif
return context;
Index: libwww_parse_xml.c
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/libwww/cc/libwww_parse_xml.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libwww_parse_xml.c 17 Mar 2001 05:44:01 -0000 1.14
+++ libwww_parse_xml.c 31 Dec 2003 01:04:51 -0000 1.15
@@ -73,12 +73,12 @@
USERDATA *userdata_obj = (USERDATA *) userdata;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_beginElement(%s): stackptr=%d tag=%s suppress=%d choose=%d",
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_beginElement(%s): stackptr=%d tag=%s suppress=%d choose=%d",
RequestID(userdata_obj->request),
userdata_obj->stackptr, tag,
IS_SUPPRESSED_TAG((HKEY)(char *)tag, userdata_obj->request),
IS_SELECTED_TAG((HKEY)(char *)tag, userdata_obj->request)
- );
+ ));
#endif
if (IS_STRIPPED_TAG((HKEY)(char *)tag, userdata_obj->request)) return;
@@ -108,9 +108,10 @@
USERDATA *userdata_obj = (USERDATA *) userdata;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_endElement(%s): stackptr=%d, tag=%s",
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_endElement(%s): stackptr=%d, tag=%s",
RequestID(userdata_obj->request),
- userdata_obj->stackptr, tag);
+ userdata_obj->stackptr, tag
+ ));
#endif
if (IS_STRIPPED_TAG((HKEY)(char *)tag, userdata_obj->request)) return;
@@ -145,7 +146,7 @@
(REQUEST_CONTEXT *)HTRequest_context(userdata_obj->request);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_addText (%s)", RequestID(userdata_obj->request));
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_addText (%s)", RequestID(userdata_obj->request)));
#endif
if (IS_STRIPPED_TAG((HKEY)"pcdata", userdata_obj->request)) return;
@@ -168,7 +169,7 @@
shift = strlen("\n");
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In addText: pcdata=%s", pcdata_buf.string+shift);
+ xsb_dbgmsg((LOG_DEBUG,"***In addText: pcdata=%s", pcdata_buf.string+shift));
#endif
/* put the text string into the elt term and then pop it */
@@ -202,7 +203,7 @@
strcpy_lower(attrname.string, (char *)*attrs);
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***attr=%s", attrname.string);
+ xsb_dbgmsg((LOG_DEBUG,"***attr=%s", attrname.string));
#endif
prop_list_head = p2p_car(prop_list_tail);
c2p_functor("attval",2,prop_list_head);
@@ -243,8 +244,8 @@
userdata->stackptr++;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_push_element(%s): stackptr=%d tag=%s",
- RequestID(userdata->request), userdata->stackptr, tag);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_push_element(%s): stackptr=%d tag=%s",
+ RequestID(userdata->request), userdata->stackptr, tag));
#endif
CHECK_STACK_OVERFLOW(userdata);
@@ -271,7 +272,7 @@
collect_xml_attributes(STACK_TOP(userdata).elt_term, attrs);
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***elt_name=%s", lower_tagname.string);
+ xsb_dbgmsg((LOG_DEBUG,"***elt_name=%s", lower_tagname.string));
print_prolog_term(STACK_TOP(userdata).elt_term, "elt_term");
#endif
@@ -289,12 +290,12 @@
PRIVATE void xml_pop_element(USERDATA *userdata)
{
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In xml_pop_element(%s): stackptr=%d, elt_name=%s",
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_pop_element(%s): stackptr=%d, elt_name=%s",
RequestID(userdata->request),
userdata->stackptr,
- STACK_TOP(userdata).tag);
+ STACK_TOP(userdata).tag));
#endif
- /* close the property list, for notmal elements */
+ /* close the property list, for normal elements */
if (strcasecmp(STACK_TOP(userdata).tag, "pcdata")!=0) {
c2p_nil(STACK_TOP(userdata).content_list_tail);
}
@@ -358,8 +359,8 @@
userdata->stackptr--;
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In xml_pop_suppressed_element(%s): stackptr=%d",
- RequestID(userdata->request), userdata->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_pop_suppressed_element(%s): stackptr=%d",
+ RequestID(userdata->request), userdata->stackptr));
if (userdata->stackptr >= 0)
print_prolog_term(STACK_TOP(userdata).content_list_tail, "content_list_tail");
else
@@ -376,7 +377,7 @@
{
USERDATA *me = NULL;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Start xml_create_userData: Request %s", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Start xml_create_userData: Request %s", RequestID(request)));
#endif
if (parser) {
/* make sure that MIME type is appropriate for XML */
@@ -405,7 +406,7 @@
}
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***End xml_create_userData: Request %s", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***End xml_create_userData: Request %s", RequestID(request)));
#endif
/* Hook up userdata to the request context */
@@ -429,8 +430,8 @@
} else return;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_delete_userData(%s): stackptr=%d",
- RequestID(request), me->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_delete_userData(%s): stackptr=%d",
+ RequestID(request), me->stackptr));
#endif
/* if the status code says the doc was loaded fine, but stackptr is != -1,
@@ -454,7 +455,7 @@
HT_FREE(me);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Request %s: freed the USERDATA object", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Request %s: freed the USERDATA object", RequestID(request)));
#endif
return;
@@ -550,7 +551,7 @@
total_number_of_requests++;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_externalEntityRef(%s): uri=%s", RequestID(request), uri);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_externalEntityRef(%s): uri=%s", RequestID(request), uri));
#endif
/* libwww breaks when a local file request is issued concurrently with an
@@ -599,8 +600,8 @@
unparsed.length = len;
XSB_StrNullTerminate(&unparsed);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_default: Request: %s: Unparsed: %s",
- RequestID(((USERDATA *)userData)->request), unparsed.string);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_default: Request: %s: Unparsed: %s",
+ RequestID(((USERDATA *)userData)->request), unparsed.string));
#endif
return;
@@ -622,8 +623,8 @@
userdata->stackptr++;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_push_dummy(%s): stackptr=%d",
- RequestID(userdata->request), userdata->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_push_dummy(%s): stackptr=%d",
+ RequestID(userdata->request), userdata->stackptr));
#endif
CHECK_STACK_OVERFLOW(userdata);
@@ -674,8 +675,8 @@
if (status==HT_LOADED) {
ext_entity_expansion = HTChunk_toCString(context->result_chunk);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_entity_termination_handler(%s): entity=%s",
- RequestID(request), ext_entity_expansion);
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_entity_termination_handler(%s): entity=%s",
+ RequestID(request), ext_entity_expansion));
#endif
XML_Parse(extParser,ext_entity_expansion,strlen(ext_entity_expansion),1);
HT_FREE(ext_entity_expansion);
@@ -683,8 +684,8 @@
prolog_term request_result = p2p_car(context->request_result);
char *uri = HTAnchor_address((HTAnchor *)HTRequest_anchor(request));
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_entity_termination_handler(%s): request failed",
- RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_entity_termination_handler(%s): request failed",
+ RequestID(request)));
#endif
c2p_functor("unexpanded_entity",2,request_result);
c2p_string(uri,p2p_arg(request_result,1));
@@ -704,8 +705,8 @@
HTEventList_stopLoop();
event_loop_runnung = FALSE;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In xml_entity_termination_handler: event loop halted, status=%d, HTNetCount=%d",
- status, HTNet_count());
+ xsb_dbgmsg((LOG_DEBUG,"***In xml_entity_termination_handler: event loop halted, status=%d, HTNetCount=%d",
+ status, HTNet_count()));
#endif
}
Index: libwww_parse_rdf.c
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/libwww/cc/libwww_parse_rdf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libwww_parse_rdf.c 17 Mar 2001 05:44:01 -0000 1.4
+++ libwww_parse_rdf.c 31 Dec 2003 01:04:51 -0000 1.5
@@ -99,7 +99,7 @@
USERDATA *userdata = (USERDATA *)context;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In rdf_new_triple_handler(%s)", RequestID(userdata->request));
+ xsb_dbgmsg((LOG_DEBUG,"***In rdf_new_triple_handler(%s)", RequestID(userdata->request)));
#endif
/* create a new triple */
if (rdfp && t) {
@@ -135,7 +135,7 @@
{
USERDATA *me = NULL;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Start rdf_create_userData: Request %s", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Start rdf_create_userData: Request %s", RequestID(request)));
#endif
if (parser) {
/* make sure that MIME type is appropriate for RDF */
@@ -161,7 +161,7 @@
}
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***End rdf_create_userData: Request %s", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***End rdf_create_userData: Request %s", RequestID(request)));
#endif
/* Hook up userdata to the request context */
@@ -187,7 +187,7 @@
else return;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In rdf_delete_userData(%s)", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***In rdf_delete_userData(%s)", RequestID(request)));
#endif
#ifdef LIBWWW_DEBUG_VERBOSE
@@ -207,7 +207,7 @@
HT_FREE(me);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Request %s: freed the USERDATA object", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Request %s: freed the USERDATA object", RequestID(request)));
#endif
return;
Index: libwww_parse_html.c
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/libwww/cc/libwww_parse_html.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libwww_parse_html.c 17 Mar 2001 05:44:01 -0000 1.11
+++ libwww_parse_html.c 31 Dec 2003 01:04:51 -0000 1.12
@@ -41,12 +41,12 @@
{
#ifdef LIBWWW_DEBUG
HTTag *tag = SGML_findTag(htext->dtd, element_number);
- xsb_dbgmsg("***In html_beginElement(%s): stackptr=%d tag=%s suppress=%d choose=%d",
+ xsb_dbgmsg((LOG_DEBUG,"***In html_beginElement(%s): stackptr=%d tag=%s suppress=%d choose=%d",
RequestID(htext->request),
htext->stackptr, HTTag_name(tag),
IS_SUPPRESSED_TAG((HKEY)element_number, htext->request),
IS_SELECTED_TAG((HKEY)element_number, htext->request)
- );
+ ));
#endif
if (IS_STRIPPED_TAG((HKEY)element_number, htext->request)) return;
@@ -73,8 +73,8 @@
int i, match;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In html_endElement(%s): stackptr=%d",
- RequestID(htext->request), htext->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In html_endElement(%s): stackptr=%d",
+ RequestID(htext->request), htext->stackptr));
#endif
if (IS_STRIPPED_TAG((HKEY)element_number, htext->request)) return;
@@ -84,7 +84,7 @@
if (match < 0) return;
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***match=%d", match);
+ xsb_dbgmsg((LOG_DEBUG,"***match=%d", match));
#endif
for (i=htext->stackptr; i>=match; i--)
@@ -114,7 +114,7 @@
(REQUEST_CONTEXT *)HTRequest_context(htext->request);
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In html_addText: Request %s", RequestID(htext->request));
+ xsb_dbgmsg((LOG_DEBUG,"***In html_addText: Request %s", RequestID(htext->request)));
#endif
if (IS_STRIPPED_TAG((HKEY)PCDATA_SPECIAL, htext->request)) return;
@@ -165,8 +165,8 @@
c2p_list(prop_list_tail);
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In collect_html_attributes: tag_attributes_number=%d",
- tag_attributes_number);
+ xsb_dbgmsg((LOG_DEBUG,"***In collect_html_attributes: tag_attributes_number=%d",
+ tag_attributes_number));
#endif
for (cnt=0; cnt<tag_attributes_number; cnt++) {
@@ -175,8 +175,8 @@
strcpy_lower(attrname.string, HTTag_attributeName(tag, cnt));
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***attr=%s, val=%s ",
- attrname.string, (char *)value[cnt]);
+ xsb_dbgmsg((LOG_DEBUG,"***attr=%s, val=%s ",
+ attrname.string, (char *)value[cnt]));
#endif
prop_list_head = p2p_car(prop_list_tail);
c2p_functor("attval",2,prop_list_head);
@@ -218,8 +218,8 @@
htext->stackptr++;
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In html_push_element(%s): stackptr=%d",
- RequestID(htext->request), htext->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In html_push_element(%s): stackptr=%d",
+ RequestID(htext->request), htext->stackptr));
#endif
CHECK_STACK_OVERFLOW(htext);
@@ -241,7 +241,7 @@
c2p_string(tagname.string, p2p_arg(STACK_TOP(htext).elt_term, 1));
collect_html_attributes(STACK_TOP(htext).elt_term, tag, present, value);
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***elt_name=%s", HTTag_name(tag));
+ xsb_dbgmsg((LOG_DEBUG,"***elt_name=%s", HTTag_name(tag)));
print_prolog_term(STACK_TOP(htext).elt_term, "elt_term");
#endif
@@ -264,10 +264,10 @@
PRIVATE void html_pop_element(USERDATA *htext)
{
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In html_pop_element(%s): stackptr=%d, elt_name=%s",
+ xsb_dbgmsg((LOG_DEBUG,"***In html_pop_element(%s): stackptr=%d, elt_name=%s",
RequestID(htext->request),
htext->stackptr,
- HTTag_name(special_find_tag(htext, STACK_TOP(htext).element_number)));
+ HTTag_name(special_find_tag(htext, STACK_TOP(htext).element_number))));
#endif
/* close the property list, for notmal elements */
switch (STACK_TOP(htext).element_type) {
@@ -337,8 +337,8 @@
htext->stackptr--;
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In html_pop_suppressed_element(%s): stackptr=%d",
- RequestID(htext->request), htext->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In html_pop_suppressed_element(%s): stackptr=%d",
+ RequestID(htext->request), htext->stackptr));
if (htext->stackptr >= 0)
print_prolog_term(STACK_TOP(htext).content_list_tail, "content_list_tail");
else
@@ -354,13 +354,13 @@
int i;
for (i=htext->stackptr; i>=0; i--) {
#ifdef LIBWWW_DEBUG_VERBOSE
- xsb_dbgmsg("***In find_matching_elt");
- xsb_dbgmsg("***i=%d htext->stack[i].element_number=%d(%s) elt_number=%d(%s)",
+ xsb_dbgmsg((LOG_DEBUG,"***In find_matching_elt"));
+ xsb_dbgmsg((LOG_DEBUG,"***i=%d htext->stack[i].element_number=%d(%s) elt_number=%d(%s)",
i,
htext->stack[i].element_number,
SGML_findTagName(htext->dtd, htext->stack[i].element_number),
elt_number,
- SGML_findTagName(htext->dtd, elt_number));
+ SGML_findTagName(htext->dtd, elt_number)));
#endif
if (htext->stack[i].element_number == elt_number)
return i;
@@ -386,7 +386,7 @@
USERDATA *me = NULL;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Start html_create_userData(%s):", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Start html_create_userData(%s):", RequestID(request)));
#endif
if (request) {
/* make sure that MIME type is appropriate for HTML */
@@ -415,7 +415,7 @@
}
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In html_create_userData(%s):", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***In html_create_userData(%s):", RequestID(request)));
#endif
/* Hook up userdata to the request context */
@@ -439,8 +439,8 @@
} else return;
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***In html_delete_userData(%s): stackptr=%d",
- RequestID(request), me->stackptr);
+ xsb_dbgmsg((LOG_DEBUG,"***In html_delete_userData(%s): stackptr=%d",
+ RequestID(request), me->stackptr));
#endif
/* close open tags on stack */
@@ -466,7 +466,7 @@
HT_FREE(me);
#ifdef LIBWWW_DEBUG
- xsb_dbgmsg("***Request %s: freed the USERDATA obj", RequestID(request));
+ xsb_dbgmsg((LOG_DEBUG,"***Request %s: freed the USERDATA obj", RequestID(request)));
#endif
return;
|