From fe10af364d0443d4750888e49b551b5e216f5597 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 9 Jan 2006 01:29:40 +0100
Subject: [PATCH] Introduce pop_html_element(); wraps kill_html_stack_item(...,
 html_top)

---
 src/document/html/parser/forms.c   |  8 ++++----
 src/document/html/parser/general.c |  2 +-
 src/document/html/parser/link.c    | 10 +++++-----
 src/document/html/parser/parse.c   |  2 +-
 src/document/html/parser/stack.h   |  2 ++
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/document/html/parser/forms.c b/src/document/html/parser/forms.c
index a0431bf3..d204fe4d 100644
--- a/src/document/html/parser/forms.c
+++ b/src/document/html/parser/forms.c
@@ -254,7 +254,7 @@ html_input_format(struct html_context *html_context, unsigned char *a,
 		case FC_HIDDEN:
 			INTERNAL("bad control type");
 	}
-	kill_html_stack_item(html_context, html_top);
+	kill_html_stack_top(html_context);
 	put_chrs(html_context, " ", 1);
 }
 
@@ -498,7 +498,7 @@ end_parse:
 	for (i = 0; i < max_width; i++)
 		put_chrs(html_context, "_", 1);
 
-	kill_html_stack_item(html_context, html_top);
+	kill_html_stack_top(html_context);
 	put_chrs(html_context, "]", 1);
 	html_context->special_f(html_context, SP_CONTROL, fc);
 }
@@ -603,7 +603,7 @@ end_parse:
 	format.form = fc;
 	format.style.attr |= AT_BOLD;
 	put_chrs(html_context, "[ ]", 3);
-	kill_html_stack_item(html_context, html_top);
+	kill_html_stack_top(html_context);
 	put_chrs(html_context, " ", 1);
 	html_context->special_f(html_context, SP_CONTROL, fc);
 }
@@ -709,7 +709,7 @@ pp:
 			ln_break(html_context, 1);
 	}
 
-	kill_html_stack_item(html_context, html_top);
+	kill_html_stack_top(html_context);
 	if (rows > 1)
 		ln_break(html_context, 1);
 	else
diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 4c7c4364..6f947ee9 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -586,7 +586,7 @@ html_hr(struct html_context *html_context, unsigned char *a,
 	}
 	html_context->special_f(html_context, SP_NOWRAP, 0);
 	ln_break(html_context, 2);
-	kill_html_stack_item(html_context, html_top);
+	kill_html_stack_top(html_context);
 }
 
 void
diff --git a/src/document/html/parser/link.c b/src/document/html/parser/link.c
index 2a40251c..3025f8a7 100644
--- a/src/document/html/parser/link.c
+++ b/src/document/html/parser/link.c
@@ -89,7 +89,7 @@ html_a(struct html_context *html_context, unsigned char *a,
 		html_focusable(html_context, a);
 
 	} else {
-		kill_html_stack_item(html_context, html_top);
+		kill_html_stack_top(html_context);
 	}
 
 	set_fragment_identifier(html_context, a, "name");
@@ -269,7 +269,7 @@ html_img_do(unsigned char *a, unsigned char *object_src,
 		 * If not, just exit now. */
 		if (!options->images && !format.link) {
 			mem_free_if(src);
-			if (usemap) kill_html_stack_item(html_context, html_top);
+			if (usemap) kill_html_stack_top(html_context);
 			return;
 		}
 
@@ -332,7 +332,7 @@ html_img_do(unsigned char *a, unsigned char *object_src,
 
 			put_image_label(a, label, html_context);
 
-			if (ismap) kill_html_stack_item(html_context, html_top);
+			if (ismap) kill_html_stack_top(html_context);
 			mem_free_set(&format.image, NULL);
 			mem_free_set(&format.title, NULL);
 		}
@@ -341,7 +341,7 @@ html_img_do(unsigned char *a, unsigned char *object_src,
 	}
 
 	mem_free_if(src);
-	if (usemap) kill_html_stack_item(html_context, html_top);
+	if (usemap) kill_html_stack_top(html_context);
 }
 
 void
@@ -369,7 +369,7 @@ put_link_line(unsigned char *prefix, unsigned char *linkname,
 	format.style.fg = format.clink;
 	put_chrs(html_context, linkname, strlen(linkname));
 	ln_break(html_context, 1);
-	kill_html_stack_item(html_context, html_top);
+	kill_html_stack_top(html_context);
 }
 
 
diff --git a/src/document/html/parser/parse.c b/src/document/html/parser/parse.c
index fc313692..67d0a750 100644
--- a/src/document/html/parser/parse.c
+++ b/src/document/html/parser/parse.c
@@ -767,7 +767,7 @@ start_element(struct element_info *ei,
 #endif
 
 	if (html_top->type == ELEMENT_WEAK) {
-		kill_html_stack_item(html_context, html_top);
+		kill_html_stack_top(html_context);
 	}
 
 	/* We try to process nested <script> if we didn't process the parent
diff --git a/src/document/html/parser/stack.h b/src/document/html/parser/stack.h
index 1ac11398..16d194b3 100644
--- a/src/document/html/parser/stack.h
+++ b/src/document/html/parser/stack.h
@@ -14,6 +14,8 @@ void html_stack_dup(struct html_context *html_context,
 
 void kill_html_stack_item(struct html_context *html_context,
                           struct html_element *e);
+#define kill_html_stack_top(html_context) \
+	kill_html_stack_item(html_context, html_top)
 void kill_html_stack_until(struct html_context *html_context, int ls, ...);
 
 /* void dump_html_stack(struct html_context *html_context); */