summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog1
-rw-r--r--dpi/downloads.cc3
-rw-r--r--dpid/misc_new.c6
-rw-r--r--dpip/dpip.c15
-rw-r--r--dw/fltkui.cc2
-rw-r--r--dw/style.cc23
-rw-r--r--src/IO/http.c4
-rw-r--r--src/cssparser.cc3
-rw-r--r--src/html.cc12
-rw-r--r--src/menu.cc13
-rw-r--r--src/nav.c3
-rw-r--r--src/table.cc9
-rw-r--r--test/dw_anchors_test.cc2
13 files changed, 39 insertions, 57 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d9228f1..391c0fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ dillo-2.2.1 [July ??, 2011]
- Accept application/xhtml+xml.
- Small caps support.
- Border-collapse, border-style properties.
+ - Removed gcc warnings for 64bit
Patches: Jorge Arellano Cid
+- Configurable User-Agent HTTP header.
Patch: Alexander Voigt, corvid
diff --git a/dpi/downloads.cc b/dpi/downloads.cc
index 1a70d235..e2fc805a 100644
--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@@ -599,13 +599,11 @@ static void read_log_cb(int fd_in, void *data)
const int BufLen = 4096;
char Buf[BufLen];
ssize_t st;
- int ret = -1;
do {
st = read(fd_in, Buf, BufLen);
if (st < 0) {
if (errno == EAGAIN) {
- ret = 1;
break;
}
perror("read, ");
@@ -614,7 +612,6 @@ static void read_log_cb(int fd_in, void *data)
close(fd_in);
remove_fd(fd_in, 1);
dl_item->log_done(1);
- ret = 0;
break;
} else {
dl_item->log_text_add(Buf, st);
diff --git a/dpid/misc_new.c b/dpid/misc_new.c
index 7f963aed..8c07a4eb 100644
--- a/dpid/misc_new.c
+++ b/dpid/misc_new.c
@@ -71,14 +71,12 @@ Dstr *a_Misc_rdtag(int socket)
*/
char *a_Misc_readtag(int sock)
{
- char *tag, c, buf[10];
- size_t buflen, i;
+ char *tag, c;
+ size_t i;
size_t taglen = 0, tagmem = 10;
ssize_t rdln = 1;
tag = NULL;
- buf[0] = '\0';
- buflen = sizeof(buf) / sizeof(buf[0]);
// new start
tag = (char *) dMalloc(tagmem + 1);
for (i = 0; (rdln = read(sock, &c, 1)) != 0; i++) {
diff --git a/dpip/dpip.c b/dpip/dpip.c
index a5517784..170e4a88 100644
--- a/dpip/dpip.c
+++ b/dpip/dpip.c
@@ -214,11 +214,13 @@ int a_Dpip_check_auth(const char *auth_tag)
MSG_ERR("[a_Dpip_check_auth] empty file: %s\n", fname);
} else {
port = strtol(rcline, &tail, 10);
- for (i = 0; *tail && isxdigit(tail[i+1]); ++i)
- SharedSecret[i] = tail[i+1];
- SharedSecret[i] = 0;
- if (strcmp(msg, SharedSecret) == 0)
- ret = 1;
+ if (tail && port != 0) {
+ for (i = 0; *tail && isxdigit(tail[i+1]); ++i)
+ SharedSecret[i] = tail[i+1];
+ SharedSecret[i] = 0;
+ if (strcmp(msg, SharedSecret) == 0)
+ ret = 1;
+ }
}
if (In)
fclose(In);
@@ -376,7 +378,7 @@ int a_Dpip_dsh_write_str(Dsh *dsh, int flush, const char *str)
static void Dpip_dsh_read(Dsh *dsh, int blocking)
{
char buf[RBUF_SZ];
- int req_mode, old_flags = 0, st, ret = -3, nb = !blocking;
+ int req_mode, old_flags = 0, st, nb = !blocking;
dReturn_if (dsh->status == DPIP_ERROR || dsh->status == DPIP_EOF);
@@ -395,7 +397,6 @@ static void Dpip_dsh_read(Dsh *dsh, int blocking)
continue;
} else if (errno == EAGAIN) {
dsh->status = DPIP_EAGAIN;
- ret = -1;
break;
} else {
MSG_ERR("[Dpip_dsh_read] %s\n", dStrerror(errno));
diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index ff80e14c..697d4505 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -865,7 +865,7 @@ template <class I>
{
::fltk::Item *item = new ::fltk::Item (name);
item->set_flag (::fltk::RAW_LABEL);
- item->user_data ((void *) index);
+ item->user_data ((void *)(long) index);
return item;
}
diff --git a/dw/style.cc b/dw/style.cc
index a8f458b7..d2378f0e 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -791,8 +791,7 @@ void drawBorder (View *view, Rectangle *area,
Style *style, bool inverse)
{
/** \todo a lot! */
- Color::Shading dark, light, normal;
- int xb1, yb1, xb2, yb2, xp1, yp1, xp2, yp2;
+ int xb1, yb1, xb2, yb2;
// top left and bottom right point of outer border boundary
xb1 = x + style->margin.left;
@@ -800,15 +799,17 @@ void drawBorder (View *view, Rectangle *area,
xb2 = x + (width > 0 ? width - 1 : 0) - style->margin.right;
yb2 = y + (height > 0 ? height - 1 : 0) - style->margin.bottom;
- // top left and bottom right point of inner border boundary
- xp1 = xb1 + style->borderWidth.left;
- yp1 = yb1 + style->borderWidth.top;
- xp2 = xb2 - style->borderWidth.right;
- yp2 = yb2 - style->borderWidth.bottom;
-
- light = inverse ? Color::SHADING_DARK : Color::SHADING_LIGHT;
- dark = inverse ? Color::SHADING_LIGHT : Color::SHADING_DARK;
- normal = inverse ? Color::SHADING_INVERSE : Color::SHADING_NORMAL;
+ /*
+ // top left and bottom right point of inner border boundary
+ xp1 = xb1 + style->borderWidth.left;
+ yp1 = yb1 + style->borderWidth.top;
+ xp2 = xb2 - style->borderWidth.right;
+ yp2 = yb2 - style->borderWidth.bottom;
+
+ light = inverse ? Color::SHADING_DARK : Color::SHADING_LIGHT;
+ dark = inverse ? Color::SHADING_LIGHT : Color::SHADING_DARK;
+ normal = inverse ? Color::SHADING_INVERSE : Color::SHADING_NORMAL;
+ */
drawBorderRight(view, style, xb2, yb1, xb2, yb2);
drawBorderLeft(view, style, xb1, yb1, xb1, yb2);
diff --git a/src/IO/http.c b/src/IO/http.c
index 77a1be43..526b8460 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -174,7 +174,7 @@ static void Http_connect_queued_sockets(HostConnection_t *hc)
MSG_BW(sd->web, 1, "ERROR: %s", dStrerror(sd->Err));
a_Chain_bfcb(OpAbort, sd->Info, NULL, "Both");
dFree(sd->Info);
- Http_socket_free((int) sd->Info->LocalKey);
+ Http_socket_free(VOIDP2INT(sd->Info->LocalKey));
} else {
sd->connected_to = hc->host;
hc->active_connections++;
@@ -365,7 +365,7 @@ static void Http_send_query(ChainLink *Info, SocketData_t *S)
DataBuf *dbuf;
/* Create the query */
- query = a_Http_make_query_str(S->web->url, S->flags & HTTP_SOCKET_USE_PROXY);
+ query = a_Http_make_query_str(S->web->url,S->flags & HTTP_SOCKET_USE_PROXY);
dbuf = a_Chain_dbuf_new(query->str, query->len, 0);
/* actually this message is sent too early.
diff --git a/src/cssparser.cc b/src/cssparser.cc
index 4838f607..6bd8ba14 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -1049,7 +1049,7 @@ void CssParser::parseDeclaration(CssPropertyList * props,
CssPropertyList * importantProps)
{
CssPropertyInfo pi = {NULL, {CSS_TYPE_UNUSED}, NULL}, *pip;
- CssShorthandInfo si, *sip;
+ CssShorthandInfo *sip;
CssValueType type = CSS_TYPE_UNUSED;
CssPropertyName prop;
@@ -1087,7 +1087,6 @@ void CssParser::parseDeclaration(CssPropertyList * props,
}
} else {
/* Try shorthands. */
- si.symbol = tval;
sip =
(CssShorthandInfo *) bsearch(&pi, Css_shorthand_info,
CSS_SHORTHAND_NUM,
diff --git a/src/html.cc b/src/html.cc
index 8291aad9..45e3d64a 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1718,7 +1718,6 @@ static void Html_tag_close_style(DilloHtml *html, int TagIdx)
static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
{
const char *attrbuf;
- Textblock *textblock;
int32_t color;
int tag_index_a = a_Html_tag_index ("a");
style::Color *bgColor;
@@ -1736,8 +1735,6 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
BUG_MSG("unclosed HEAD element\n");
}
- textblock = HT2TB(html);
-
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "bgcolor"))) {
color = a_Html_color_parse(html, attrbuf, -1);
if (color != -1)
@@ -2165,7 +2162,6 @@ static void Html_tag_open_img(DilloHtml *html, const char *tag, int tagsize)
{
DilloImage *Image;
DilloUrl *url, *usemap_url;
- Textblock *textblock;
const char *attrbuf;
/* This avoids loading images. Useful for viewing suspicious HTML email. */
@@ -2176,8 +2172,6 @@ static void Html_tag_open_img(DilloHtml *html, const char *tag, int tagsize)
!(url = a_Html_url_new(html, attrbuf, NULL, 0)))
return;
- textblock = HT2TB(html);
-
usemap_url = NULL;
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "usemap")))
/* TODO: usemap URLs outside of the document are not used. */
@@ -2254,12 +2248,11 @@ static void Html_tag_close_map(DilloHtml *html, int TagIdx)
static
misc::SimpleVector<int> *Html_read_coords(DilloHtml *html, const char *str)
{
- int i, coord;
+ int coord;
const char *tail = str;
char *newtail = NULL;
misc::SimpleVector<int> *coords = new misc::SimpleVector<int> (4);
- i = 0;
while (1) {
coord = strtol(tail, &newtail, 10);
if (coord == 0 && newtail == tail)
@@ -2953,14 +2946,13 @@ void a_Html_load_stylesheet(DilloHtml *html, DilloUrl *url)
if (endq && (endq - data <= 51)) {
/* IANA limits charset names to 40 characters */
- const char *ignored;
char *content_type;
*endq = '\0';
content_type = dStrconcat("text/css; charset=", data+10, NULL);
*endq = '"';
a_Capi_unref_buf(url);
- ignored = a_Capi_set_content_type(url, content_type, "meta");
+ a_Capi_set_content_type(url, content_type, "meta");
dFree(content_type);
a_Capi_get_buf(url, &data, &len);
}
diff --git a/src/menu.cc b/src/menu.cc
index d802bddb..23c33b4a 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -581,23 +581,22 @@ void a_Menu_file_popup(BrowserWindow *bw, void *v_wid)
if (!pm) {
int shortcut;
- Item *i;
pm = new PopupMenu(0,0,0,0,"File");
pm->begin();
shortcut = Keys::getShortcut(KEYS_NEW_WINDOW);
- i = new Item("New Window", shortcut, filemenu_cb, (void*)"nw");
+ new Item("New Window", shortcut, filemenu_cb, (void*)"nw");
shortcut = Keys::getShortcut(KEYS_NEW_TAB);
- i = new Item("New Tab", shortcut, filemenu_cb, (void*)"nt");
+ new Item("New Tab", shortcut, filemenu_cb, (void*)"nt");
new Divider();
shortcut = Keys::getShortcut(KEYS_OPEN);
- i = new Item("Open File...", shortcut, filemenu_cb, (void*)"of");
+ new Item("Open File...", shortcut, filemenu_cb, (void*)"of");
shortcut = Keys::getShortcut(KEYS_GOTO);
- i = new Item("Open URL...", shortcut, filemenu_cb, (void*)"ou");
+ new Item("Open URL...", shortcut, filemenu_cb, (void*)"ou");
shortcut = Keys::getShortcut(KEYS_CLOSE_TAB);
- i = new Item("Close", shortcut, filemenu_cb, (void*)"cw");
+ new Item("Close", shortcut, filemenu_cb, (void*)"cw");
new Divider();
shortcut = Keys::getShortcut(KEYS_CLOSE_ALL);
- i = new Item("Exit Dillo", shortcut, filemenu_cb, (void*)"ed");
+ new Item("Exit Dillo", shortcut, filemenu_cb, (void*)"ed");
pm->type(PopupMenu::POPUP123);
pm->end();
}
diff --git a/src/nav.c b/src/nav.c
index c5311cfb..c7c46157 100644
--- a/src/nav.c
+++ b/src/nav.c
@@ -195,13 +195,12 @@ static void Nav_open_url(BrowserWindow *bw, const DilloUrl *url,
const DilloUrl *requester, int offset)
{
const DilloUrl *old_url;
- bool_t MustLoad, ForceReload, Repush, IgnoreScroll;
+ bool_t MustLoad, ForceReload, IgnoreScroll;
int x, y, idx, ClientKey;
DilloWeb *Web;
MSG("Nav_open_url: new url='%s'\n", URL_STR_(url));
- Repush = (URL_FLAGS(url) & URL_ReloadFromCache) != 0;
ForceReload = (URL_FLAGS(url) & (URL_E2EQuery + URL_ReloadFromCache)) != 0;
IgnoreScroll = (URL_FLAGS(url) & URL_IgnoreScroll) != 0;
diff --git a/src/table.cc b/src/table.cc
index 58cdf22e..d48a0c45 100644
--- a/src/table.cc
+++ b/src/table.cc
@@ -151,7 +151,6 @@ void Html_tag_open_tr(DilloHtml *html, const char *tag, int tagsize)
{
const char *attrbuf;
int32_t bgcolor = -1;
- bool new_style = false;
html->styleEngine->inheritNonCssHints ();
@@ -183,10 +182,8 @@ void Html_tag_open_tr(DilloHtml *html, const char *tag, int tagsize)
if (bgcolor != -1) {
html->styleEngine->setNonCssHint(CSS_PROPERTY_BACKGROUND_COLOR,
CSS_TYPE_COLOR, bgcolor);
- new_style = true;
}
- if (a_Html_tag_set_valign_attr (html, tag, tagsize))
- new_style = true;
+ a_Html_tag_set_valign_attr (html, tag, tagsize);
break;
default:
break;
@@ -318,7 +315,6 @@ static void Html_tag_open_table_cell(DilloHtml *html,
int colspan = 1, rowspan = 1;
const char *attrbuf;
int32_t bgcolor;
- bool_t new_style;
html->styleEngine->inheritNonCssHints ();
@@ -363,8 +359,7 @@ static void Html_tag_open_table_cell(DilloHtml *html,
a_Html_parse_length (html, attrbuf));
}
- if (a_Html_tag_set_valign_attr (html, tag, tagsize))
- new_style = TRUE;
+ a_Html_tag_set_valign_attr (html, tag, tagsize);
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "bgcolor"))) {
bgcolor = a_Html_color_parse(html, attrbuf, -1);
diff --git a/test/dw_anchors_test.cc b/test/dw_anchors_test.cc
index 977d724a..69122c4a 100644
--- a/test/dw_anchors_test.cc
+++ b/test/dw_anchors_test.cc
@@ -111,7 +111,7 @@ int main(int argc, char **argv)
buttonLabel[i] = strdup(buf);
::fltk::Button *button =
new ::fltk::Button(0, 20 * i, 50, 20, buttonLabel[i]);
- button->callback (anchorCallback, (void*)i);
+ button->callback (anchorCallback, (void*)(long)i);
button->when (::fltk::WHEN_RELEASE);
}