[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] Changes to qemacs/libqhtml/xmlparse.c
From: |
Charlie Gordon |
Subject: |
[Qemacs-commit] Changes to qemacs/libqhtml/xmlparse.c |
Date: |
Fri, 08 Jul 2005 05:30:49 -0400 |
Index: qemacs/libqhtml/xmlparse.c
diff -u qemacs/libqhtml/xmlparse.c:1.5 qemacs/libqhtml/xmlparse.c:1.6
--- qemacs/libqhtml/xmlparse.c:1.5 Wed May 11 15:48:31 2005
+++ qemacs/libqhtml/xmlparse.c Fri Jul 8 09:30:44 2005
@@ -174,7 +174,7 @@
b->buf = ptr;
b->allocated_size = size1;
- p = utf8_encode(b->buf + b->size, ch);
+ p = utf8_encode((char*)b->buf + b->size, ch);
b->size = p - (char *)b->buf;
}
}
@@ -184,7 +184,7 @@
const char *p;
if (b->size < b->allocated_size) {
/* fast case */
- p = utf8_encode(b->buf + b->size, ch);
+ p = utf8_encode((char*)b->buf + b->size, ch);
b->size = p - (char *)b->buf;
} else {
strbuf_addch1(b, ch);
@@ -408,7 +408,8 @@
{
const char *value;
CSSProperty *first_prop, **last_prop;
- int width, height, color, val, type;
+ QEColor color;
+ int width, height, val, type;
int border, padding;
CSSPropertyValue arg;
CSSPropertyValue args[2];
@@ -1085,7 +1086,7 @@
case XML_STATE_TAG:
if (ch == '>') {
strbuf_addch(&s->str, '\0');
- ret = parse_tag(s, s->str.buf);
+ ret = parse_tag(s, (char *)s->str.buf);
switch (ret) {
default:
case XML_STATE_TEXT:
@@ -1117,7 +1118,7 @@
not flush if comment */
if (buf) {
strbuf_addch(&s->str, '\0');
- flush_text(s, s->str.buf);
+ flush_text(s, (char *)s->str.buf);
strbuf_reset(&s->str);
} else {
flush_text_buffer(s, text_offset_start, offset0);
@@ -1161,13 +1162,13 @@
if (len >= 0 &&
s->str.buf[len] == '<' &&
s->str.buf[len + 1] == '/' &&
- !xml_tagcmp(s->str.buf + len + 2, s->pretag)) {
+ !xml_tagcmp((char *)s->str.buf + len + 2, s->pretag)) {
s->str.buf[len] = '\0';
if (!xml_tagcmp(s->pretag, "style")) {
if (s->style_sheet) {
CSSParseState b1, *b = &b1;
- b->ptr = s->str.buf;
+ b->ptr = (char *)s->str.buf;
b->line_num = s->line_num; /* XXX: incorrect */
b->filename = s->filename;
b->ignore_case = s->ignore_case;
@@ -1178,7 +1179,7 @@
} else {
/* just add the content */
if (buf) {
- flush_text(s, s->str.buf);
+ flush_text(s, (char *)s->str.buf);
} else {
/* XXX: would be incorrect if non ascii chars */
flush_text_buffer(s, text_offset_start, offset -
taglen);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] Changes to qemacs/libqhtml/xmlparse.c,
Charlie Gordon <=