[PATCH 1/1] ui-shared: Simplify cgit_print_error_page() logic

[PATCH 1/1] ui-shared: Simplify cgit_print_error_page() logic

[wub]

---
This may be a little controversial, but right now is there a reason not
to do this?

 ui-shared.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui-shared.c b/ui-shared.c
index 9a38aa9..d9541f0 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -792,13 +792,11 @@ void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
 	ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
 	ctx.page.status = code;
 	ctx.page.statusmsg = msg;
-	cgit_print_http_headers();
-	cgit_print_docstart();
-	cgit_print_pageheader();
+	cgit_print_layout_start()
 	va_start(ap, fmt);
 	cgit_vprint_error(fmt, ap);
 	va_end(ap);
-	cgit_print_docend();
+	cgit_print_layout_end();
 }
 
 void cgit_print_layout_start(void)
-- 
2.8.1

[PATCH 1/1] ui-shared: Simplify cgit_print_error_page() logic

[john]

On Wed, May 11, 2016 at 05:50:09PM +0000, Juuso Lapinlampi wrote:
> ---
> This may be a little controversial, but right now is there a reason not
> to do this?

No, I think this makes sense (although again we need your
signed-off-by).

Reviewed-by: John Keeping <john at keeping.me.uk>

>  ui-shared.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/ui-shared.c b/ui-shared.c
> index 9a38aa9..d9541f0 100644
> --- a/ui-shared.c
> +++ b/ui-shared.c
> @@ -792,13 +792,11 @@ void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
>  	ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
>  	ctx.page.status = code;
>  	ctx.page.statusmsg = msg;
> -	cgit_print_http_headers();
> -	cgit_print_docstart();
> -	cgit_print_pageheader();
> +	cgit_print_layout_start()
>  	va_start(ap, fmt);
>  	cgit_vprint_error(fmt, ap);
>  	va_end(ap);
> -	cgit_print_docend();
> +	cgit_print_layout_end();
>  }
>  
>  void cgit_print_layout_start(void)
> -- 
> 2.8.1
> 
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> http://lists.zx2c4.com/mailman/listinfo/cgit

[PATCH 1/1] ui-shared: Simplify cgit_print_error_page() logic

[Jason]

Merged, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160512/c9905a57/attachment.html>

[PATCH 1/1] ui-shared: Simplify cgit_print_error_page() logic

[Jason]

On Wed, May 11, 2016 at 7:50 PM, Juuso Lapinlampi <wub at partyvan.eu> wrote:
> -       cgit_print_docstart();
> -       cgit_print_pageheader();
> +       cgit_print_layout_start()
>         va_start(ap, fmt);

You forgot a semicolon. Please test your commits before you submit.
Otherwise you waste everyone's time.

Fixed it up myself.