aniani/elinks
0
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-06-30 22:19:29 -04:00
Code

Tidy up, drop a goto.

Browse Source
This commit is contained in:
Laurent MONIN 2005-11-10 10:39:42 +01:00 committed by Laurent MONIN
parent 4f74807a9b
commit 24a8ff7294
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/document/html/frames.c
View File

@ -41,7 +41,7 @@ add_frameset_entry(struct frameset_desc *frameset_desc,
* There may exist a true fix for this... --Zas */ * There may exist a true fix for this... --Zas */
/* May the one truly fixing this notify'n'close bug 237 in the /* May the one truly fixing this notify'n'close bug 237 in the
* Bugzilla... --pasky */ * Bugzilla... --pasky */
if (frameset_desc->box.y >= frameset_desc-> box.height) if (frameset_desc->box.y >= frameset_desc->box.height)
return; return;
offset = frameset_desc->box.x offset = frameset_desc->box.x
@ -49,7 +49,7 @@ add_frameset_entry(struct frameset_desc *frameset_desc,
frame_desc = &frameset_desc->frame_desc[offset]; frame_desc = &frameset_desc->frame_desc[offset];
frame_desc->subframe = subframe; frame_desc->subframe = subframe;
frame_desc->name = null_or_stracpy(name); frame_desc->name = null_or_stracpy(name);
frame_desc->uri = url && *url ? get_uri(url, 0) : NULL; frame_desc->uri = (url && *url) ? get_uri(url, 0) : NULL;
if (!frame_desc->uri) if (!frame_desc->uri)
frame_desc->uri = get_uri("about:blank", 0); frame_desc->uri = get_uri("about:blank", 0);
@ -167,26 +167,29 @@ static struct document_view *
format_frame(struct session *ses, struct frame_desc *frame_desc, format_frame(struct session *ses, struct frame_desc *frame_desc,
struct document_options *o, int depth) struct document_options *o, int depth)
{ {
struct cache_entry *cached;
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
struct frame *frame;
int plain; int plain;
assert(ses && frame_desc && o); assert(ses && frame_desc && o);
if_assert_failed return NULL; if_assert_failed return NULL;
repeat: while (1) {
frame = ses_find_frame(ses, frame_desc->name); struct cache_entry *cached;
if (!frame) return NULL; struct frame *frame = ses_find_frame(ses, frame_desc->name);
vs = &frame->vs; if (!frame) return NULL;
cached = find_in_cache(vs->uri);
if (!cached) return NULL; vs = &frame->vs;
plain = o->plain; cached = find_in_cache(vs->uri);
if (vs->plain != -1) o->plain = vs->plain; if (!cached) return NULL;
plain = o->plain;
if (vs->plain != -1) o->plain = vs->plain;
if (!cached->redirect || frame->redirect_cnt >= MAX_REDIRECTS)
break;
if (cached->redirect && frame->redirect_cnt < MAX_REDIRECTS) {
frame->redirect_cnt++; frame->redirect_cnt++;
done_uri(vs->uri); done_uri(vs->uri);
vs->uri = get_uri_reference(cached->redirect); vs->uri = get_uri_reference(cached->redirect);
@ -194,7 +197,6 @@ repeat:
vs->ecmascript_fragile = 1; vs->ecmascript_fragile = 1;
#endif #endif
o->plain = plain; o->plain = plain;
goto repeat;
} }
doc_view = find_fd(ses, frame_desc->name, depth, o->box.x, o->box.y); doc_view = find_fd(ses, frame_desc->name, depth, o->box.x, o->box.y);