diff options
| author | Richard Wilson <rjw@netsurf-browser.org> | 2004-07-25 22:47:54 +0000 |
|---|---|---|
| committer | Richard Wilson <rjw@netsurf-browser.org> | 2004-07-25 22:47:54 +0000 |
| commit | b0fa41bb1175fe40235cfb627d08556be3141046 (patch) | |
| tree | b74af3048da547ebe05a65d4cc8b7b24253544b4 | |
| parent | 9ff81cb0ee66b75bb7a067df1f3b170e6f2fa3c0 (diff) | |
| download | netsurf-b0fa41bb1175fe40235cfb627d08556be3141046.tar.gz netsurf-b0fa41bb1175fe40235cfb627d08556be3141046.tar.bz2 | |
[project @ 2004-07-25 22:47:54 by rjw]
Fix for fix for broken hotlist loading. Removed debug comments from mng.c
svn path=/import/netsurf/; revision=1148
| -rw-r--r-- | riscos/hotlist.c | 8 | ||||
| -rw-r--r-- | riscos/mng.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 9c82249df..944cd70be 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -464,11 +464,11 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry, bool a int visits = 0; bool add_entry; - while (cur) { + while (true) { /* Add any items that have had all the data they can have */ 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, "ul")))))) { @@ -494,6 +494,10 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry, bool a visits = 0; } } + + /* Abort if we've ran out of content + */ + if (cur == NULL) return; /* Gather further information and recurse */ diff --git a/riscos/mng.c b/riscos/mng.c index e02811359..8177bc269 100644 --- a/riscos/mng.c +++ b/riscos/mng.c @@ -122,7 +122,6 @@ mng_bool nsmng_readdata(mng_handle mng, mng_ptr buffer, mng_uint32 size, mng_uin /* Get our content back */ c = (struct content *)mng_get_userdata(mng); - LOG(("Reading data")); /* 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); c->data.mng.read_size += *bytesread; } - LOG(("Read data (%i bytes, %i total)", *bytesread, c->data.mng.read_size)); /* Return success */ @@ -193,8 +191,6 @@ mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, mng_uint32 height if (mng_set_canvasstyle(mng, MNG_CANVAS_RGBA8) != MNG_NOERROR) { LOG(("Error setting canvas style.")); } - - LOG(("Created canvas (%ix%i)", c->width, c->height)); /* Return success */ |