lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

- nanohttp.c: added xmlNanoHTTPTimeout(int delay), removed a bug

Browse Source 
xmlNanoHTTPMethod on input MimeType Tony Lam <Tony.Lam@eng.sun.com>
- xpointer.c: slight extension of xmlXPtrLocationSetMerge
Daniel
This commit is contained in:
Daniel Veillard
2000-10-11 23:50:35 +00:00
parent b0426caeb9
commit 19d6111574
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xpointer.c
View File

@ -381,10 +381,11 @@ xmlXPtrLocationSetAdd(xmlLocationSetPtr cur, xmlXPathObjectPtr val) {
/**
* xmlXPtrLocationSetMerge:
* @val1: the first LocationSet
* @val1: the first LocationSet or NULL
* @val2: the second LocationSet
*
* Merges two rangesets, all ranges from @val2 are added to @val1
* if @val1 is NULL, a new set is created and copied from @val2
*
* Returns val1 once extended or NULL in case of error.
*/
@ -392,8 +393,12 @@ xmlLocationSetPtr
xmlXPtrLocationSetMerge(xmlLocationSetPtr val1, xmlLocationSetPtr val2) {
int i;
if (val1 == NULL) return(NULL);
if (val2 == NULL) return(val1);
if (val1 == NULL) {
val1 = xmlXPtrLocationSetCreate(NULL);
if (val1 == NULL)
return(NULL);
}
/*
* !!!!! this can be optimized a lot, knowing that both