aboutsummaryrefslogtreecommitdiffstats
path: root/uri.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2000-07-14 14:49:25 +0000
committerDaniel Veillard <veillard@src.gnome.org>2000-07-14 14:49:25 +0000
commit32bc74ef98c7bd6172327fb03f68766f6ee4b6a2 (patch)
treeddef7c9058df5c69694c2de2f6ae3be6eb966f65 /uri.c
parent8d86964a4aa0f89344ba2065830ad30e6d0e0d47 (diff)
downloadandroid_external_libxml2-32bc74ef98c7bd6172327fb03f68766f6ee4b6a2.tar.gz
android_external_libxml2-32bc74ef98c7bd6172327fb03f68766f6ee4b6a2.tar.bz2
android_external_libxml2-32bc74ef98c7bd6172327fb03f68766f6ee4b6a2.zip
- doc/encoding.html doc/xml.html: added I18N doc
- encoding.[ch] HTMLtree.[ch] parser.c HTMLparser.c: I18N encoding improvements, both parser and filters, added ASCII & HTML, fixed the ISO-Latin-1 one - xmllint.c testHTML.c: added/made visible --encode - debugXML.c : cleanup - most .c files: applied patches due to warning on Windows and when using Sun Pro cc compiler - xpath.c : cleanup memleaks - nanoftp.c : added a TESTING preprocessor flag for standalong compile so that people can report bugs more easilly - nanohttp.c : ditched socklen_t which was a portability mess and replaced it with unsigned int. - tree.[ch]: added xmlHasProp() - TODO: updated - test/ : added more test for entities, NS, encoding, HTML, wap - configure.in: preparing for 2.2.0 release Daniel
Diffstat (limited to 'uri.c')
-rw-r--r--uri.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/uri.c b/uri.c
index ac7aa0b7..1ed14104 100644
--- a/uri.c
+++ b/uri.c
@@ -207,7 +207,7 @@ xmlSaveUri(xmlURIPtr uri) {
max = 80;
- ret = xmlMalloc((max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlMalloc((max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -219,7 +219,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -229,7 +229,7 @@ xmlSaveUri(xmlURIPtr uri) {
}
if (len >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -242,7 +242,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -278,7 +278,7 @@ xmlSaveUri(xmlURIPtr uri) {
}
if (len >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -289,7 +289,7 @@ xmlSaveUri(xmlURIPtr uri) {
if (uri->server != NULL) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -302,7 +302,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -338,7 +338,7 @@ xmlSaveUri(xmlURIPtr uri) {
}
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -350,7 +350,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -361,7 +361,7 @@ xmlSaveUri(xmlURIPtr uri) {
if (uri->port > 0) {
if (len + 10 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -372,7 +372,7 @@ xmlSaveUri(xmlURIPtr uri) {
} else if (uri->authority != NULL) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -384,7 +384,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -424,7 +424,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -462,7 +462,7 @@ xmlSaveUri(xmlURIPtr uri) {
if (uri->query != NULL) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -473,7 +473,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -508,7 +508,7 @@ xmlSaveUri(xmlURIPtr uri) {
if (uri->fragment != NULL) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -519,7 +519,7 @@ xmlSaveUri(xmlURIPtr uri) {
while (*p != 0) {
if (len + 3 >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);
@@ -553,7 +553,7 @@ xmlSaveUri(xmlURIPtr uri) {
}
if (len >= max) {
max *= 2;
- ret = xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
+ ret = (xmlChar *) xmlRealloc(ret, (max + 1) * sizeof(xmlChar));
if (ret == NULL) {
fprintf(stderr, "xmlSaveUri: out of memory\n");
return(NULL);