[Refactor] #40236 Separated write_html_footer() from do_cmd_save_screen_html_aux()

diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c
index 6113e9e..8818f02 100644 (file)
--- a/src/cmd/cmd-process-screen.c
+++ b/src/cmd/cmd-process-screen.c
@@ -150,6 +150,32 @@ static void write_html_header(FILE *tmpfff, FILE *fff, char buf[], size_t buf_si
 }
 
 
+/*!
+ * @brief HTMLフッタを書き込む
+ * @param tmpfff 一時ファイルへの参照ポインタ
+ * @param fff 記念撮影ファイルへの参照ポインタ
+ * @param buf バッファ
+ * @param buf_size バッファサイズ
+ */
+static void write_html_footer(FILE *tmpfff, FILE *fff, char buf[], size_t buf_size)
+{
+       fprintf(fff, "</font>");
+       if (!tmpfff)
+       {
+               for (int i = 0; html_foot[i]; i++)
+                       fputs(html_foot[i], fff);
+       }
+       else
+       {
+               rewind(tmpfff);
+               read_temporary_file(fff, tmpfff, buf, buf_size, 2);
+               my_fclose(tmpfff);
+       }
+
+       fprintf(fff, "\n");
+}
+
+
 void do_cmd_save_screen_html_aux(char *filename, int message)
 {
        TERM_LEN wid, hgt;
@@ -157,7 +183,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
        FILE_TYPE(FILE_TYPE_TEXT);
        FILE *fff;
        fff = my_fopen(filename, "w");
-       if (!check_screen_html_can_open) return;
+       if (!check_screen_html_can_open(fff, filename, message)) return;
 
        if (message) screen_save();
 
@@ -167,21 +193,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
        tmpfff = my_fopen(buf, "r");
        write_html_header(tmpfff, fff, buf, sizeof(buf));
        screen_dump_lines(wid, hgt, fff);
-
-       fprintf(fff, "</font>");
-       if (!tmpfff)
-       {
-               for (int i = 0; html_foot[i]; i++)
-                       fputs(html_foot[i], fff);
-       }
-       else
-       {
-               rewind(tmpfff);
-               read_temporary_file(fff, tmpfff, buf, sizeof(buf), 2);
-               my_fclose(tmpfff);
-       }
-
-       fprintf(fff, "\n");
+       write_html_footer(tmpfff, fff, buf, sizeof(buf));
        my_fclose(fff);
        if (message)
        {