Make the calltree a bit easier to understand by giving the

functions that call resp_begin_html() names starting with "pg_"
and those called after resp_begin_html() names with "resp_".
No functional change, purely renaming functions.

diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index fec807b..6d2dba2 100644 (file)
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.11 2014/07/13 12:44:57 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.12 2014/07/13 12:55:24 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -60,18 +60,17 @@ static      void             http_print(const char *);
 static void             http_putchar(char);
 static void             http_printquery(const struct req *);
 static void             pathgen(struct req *);
+static void             pg_error_badrequest(const char *);
+static void             pg_error_internal(void);
+static void             pg_index(const struct req *);
+static void             pg_noresult(const struct req *, const char *);
 static void             pg_search(const struct req *);
+static void             pg_searchres(const struct req *,
+                               struct manpage *, size_t);
 static void             pg_show(const struct req *, const char *);
 static void             resp_begin_html(int, const char *);
 static void             resp_begin_http(int, const char *);
 static void             resp_end_html(void);
-static void             resp_error_badrequest(const char *);
-static void             resp_error_internal(void);
-static void             resp_index(const struct req *);
-static void             resp_noresult(const struct req *,
-                               const char *);
-static void             resp_search(const struct req *,
-                               struct manpage *, size_t);
 static void             resp_searchform(const struct req *);
 static void             resp_show(const struct req *, const char *);
 
@@ -454,7 +453,7 @@ resp_searchform(const struct req *req)
 }
 
 static void
-resp_index(const struct req *req)
+pg_index(const struct req *req)
 {
 
        resp_begin_html(200, NULL);
@@ -471,7 +470,7 @@ resp_index(const struct req *req)
 }
 
 static void
-resp_noresult(const struct req *req, const char *msg)
+pg_noresult(const struct req *req, const char *msg)
 {
        resp_begin_html(200, NULL);
        resp_searchform(req);
@@ -482,7 +481,7 @@ resp_noresult(const struct req *req, const char *msg)
 }
 
 static void
-resp_error_badrequest(const char *msg)
+pg_error_badrequest(const char *msg)
 {
 
        resp_begin_html(400, "Bad Request");
@@ -496,7 +495,7 @@ resp_error_badrequest(const char *msg)
 }
 
 static void
-resp_error_internal(void)
+pg_error_internal(void)
 {
        resp_begin_html(500, "Internal Server Error");
        puts("<P>Internal Server Error</P>");
@@ -504,7 +503,7 @@ resp_error_internal(void)
 }
 
 static void
-resp_search(const struct req *req, struct manpage *r, size_t sz)
+pg_searchres(const struct req *req, struct manpage *r, size_t sz)
 {
        size_t           i, iuse, isec;
        int              prio, priouse;
@@ -733,7 +732,7 @@ format(const struct req *req, const char *file)
        if (rc >= MANDOCLEVEL_FATAL) {
                fprintf(stderr, "fatal mandoc error: %s/%s\n",
                    req->q.manpath, file);
-               resp_error_internal();
+               pg_error_internal();
                return;
        }
 
@@ -745,7 +744,7 @@ format(const struct req *req, const char *file)
        if (NULL == man && NULL == mdoc) {
                fprintf(stderr, "fatal mandoc error: %s/%s\n",
                    req->q.manpath, file);
-               resp_error_internal();
+               pg_error_internal();
                mparse_free(mp);
                return;
        }
@@ -779,7 +778,7 @@ pg_show(const struct req *req, const char *path)
        char            *sub;
 
        if (NULL == path || NULL == (sub = strchr(path, '/'))) {
-               resp_error_badrequest(
+               pg_error_badrequest(
                    "You did not specify a page to show.");
                return;
        } 
@@ -792,7 +791,7 @@ pg_show(const struct req *req, const char *path)
         */
 
        if (-1 == chdir(path)) {
-               resp_error_badrequest(
+               pg_error_badrequest(
                    "You specified an invalid manpath.");
                return;
        }
@@ -821,7 +820,7 @@ pg_search(const struct req *req)
         */
 
        if (-1 == (chdir(req->q.manpath))) {
-               resp_error_badrequest(
+               pg_error_badrequest(
                    "You specified an invalid manpath.");
                return;
        }
@@ -859,11 +858,11 @@ pg_search(const struct req *req)
        }
 
        if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
-               resp_noresult(req, "You entered an invalid query.");
+               pg_noresult(req, "You entered an invalid query.");
        else if (0 == ressz)
-               resp_noresult(req, "No results found.");
+               pg_noresult(req, "No results found.");
        else
-               resp_search(req, res, ressz);
+               pg_searchres(req, res, ressz);
 
        for (i = 0; i < sz; i++)
                free(cp[i]);
@@ -905,7 +904,7 @@ main(void)
        if (-1 == chdir(MAN_DIR)) {
                fprintf(stderr, "MAN_DIR: %s: %s\n",
                    MAN_DIR, strerror(errno));
-               resp_error_internal();
+               pg_error_internal();
                return(EXIT_FAILURE);
        } 
 
@@ -930,7 +929,7 @@ main(void)
        else if (NULL != req.q.expr)
                pg_search(&req);
        else
-               resp_index(&req);
+               pg_index(&req);
 
        for (i = 0; i < (int)req.psz; i++)
                free(req.p[i]);