mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-26 05:57:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-07-25 22:47:54 by rjw]

Browse Source 
Fix for fix for broken hotlist loading. Removed debug comments from mng.c

svn path=/import/netsurf/; revision=1148
This commit is contained in:
Richard Wilson 2004-07-25 22:47:54 +00:00
parent 9ff81cb0ee
commit b0fa41bb11
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
riscos/hotlist.c
View File

@ -464,11 +464,11 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry, bool a
int visits = 0; int visits = 0;
bool add_entry; bool add_entry;
while (cur) { while (true) {
/* Add any items that have had all the data they can have /* Add any items that have had all the data they can have
*/ */
if ((allow_add) && (load_title != NULL)) { if ((allow_add) && (load_title != NULL)) {
if ((cur->next == NULL) || ((cur->type == XML_ELEMENT_NODE) && if ((cur == NULL) || ((cur->type == XML_ELEMENT_NODE) &&
((!(strcmp(cur->name, "li"))) || (!(strcmp(cur->name, "h4"))) || ((!(strcmp(cur->name, "li"))) || (!(strcmp(cur->name, "h4"))) ||
(!(strcmp(cur->name, "ul")))))) { (!(strcmp(cur->name, "ul")))))) {
@ -495,6 +495,10 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry, bool a
} }
} }
/* Abort if we've ran out of content
*/
if (cur == NULL) return;
/* Gather further information and recurse /* Gather further information and recurse
*/ */
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {

4
riscos/mng.c
View File

@ -122,7 +122,6 @@ mng_bool nsmng_readdata(mng_handle mng, mng_ptr buffer, mng_uint32 size, mng_uin
/* Get our content back /* Get our content back
*/ */
c = (struct content *)mng_get_userdata(mng); c = (struct content *)mng_get_userdata(mng);
LOG(("Reading data"));
/* Copy any data we have (maximum of 'size') /* Copy any data we have (maximum of 'size')
*/ */
@ -132,7 +131,6 @@ mng_bool nsmng_readdata(mng_handle mng, mng_ptr buffer, mng_uint32 size, mng_uin
memcpy(buffer, c->source_data + c->data.mng.read_size, *bytesread); memcpy(buffer, c->source_data + c->data.mng.read_size, *bytesread);
c->data.mng.read_size += *bytesread; c->data.mng.read_size += *bytesread;
} }
LOG(("Read data (%i bytes, %i total)", *bytesread, c->data.mng.read_size));
/* Return success /* Return success
*/ */
@ -194,8 +192,6 @@ mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, mng_uint32 height
LOG(("Error setting canvas style.")); LOG(("Error setting canvas style."));
} }
LOG(("Created canvas (%ix%i)", c->width, c->height));
/* Return success /* Return success
*/ */
return MNG_TRUE; return MNG_TRUE;