diff options
| author | corvid <corvid@lavabit.com> | 2011-04-16 14:11:16 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2011-04-16 14:11:16 +0000 |
| commit | e0608056c4ec4431c7164ef0af9e1c7638e6ca2b (patch) | |
| tree | 14989603b45cdca0f62206ce7c5e14144cbe39cc /src/html.cc | |
| parent | 03fcca9bbb9641821e3f4d071dcf1105777182ba (diff) | |
| parent | 448a73a74c2772e4152dab497f4ac09b6373ad76 (diff) | |
merge in recent changes from main repo
Diffstat (limited to 'src/html.cc')
| -rw-r--r-- | src/html.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/html.cc b/src/html.cc index 2ba4329a..ede391a3 100644 --- a/src/html.cc +++ b/src/html.cc @@ -2044,7 +2044,7 @@ DilloImage *a_Html_image_new(DilloHtml *html, const char *tag, dFree(width_ptr); dFree(height_ptr); width_ptr = height_ptr = NULL; - MSG("a_Html_image_new: suspicious image size request %dx%d\n", w, h); + MSG("a_Html_image_new: suspicious image size request %d x %d\n", w, h); } else { if (CSS_LENGTH_TYPE(l_w) != CSS_LENGTH_TYPE_AUTO) html->styleEngine->setNonCssHint (CSS_PROPERTY_WIDTH, @@ -3720,11 +3720,8 @@ static void Html_callback(int Op, CacheClient_t *Client) static int Html_write_raw(DilloHtml *html, char *buf, int bufsize, int Eof) { char ch = 0, *p, *text; - Textblock *textblock; int token_start, buf_index; - dReturn_val_if_fail ((textblock = HT2TB(html)) != NULL, 0); - /* Now, 'buf' and 'bufsize' define a buffer aligned to start at a token * boundary. Iterate through tokens until end of buffer is reached. */ buf_index = 0; @@ -3843,7 +3840,7 @@ static int Html_write_raw(DilloHtml *html, char *buf, int bufsize, int Eof) } }/*while*/ - textblock->flush (); + HT2TB(html)->flush (); return token_start; } |