* @param orig_file 消去を行うファイル名
* @param auto_dump_mark 出力するヘッダマーク
*/
-void remove_auto_dump(concptr orig_file, concptr auto_dump_mark)
+void remove_auto_dump(const std::filesystem::path &orig_file, std::string_view auto_dump_mark)
{
char buf[1024];
bool between_mark = false;
char header_mark_str[80];
char footer_mark_str[80];
- strnfmt(header_mark_str, sizeof(header_mark_str), auto_dump_header, auto_dump_mark);
- strnfmt(footer_mark_str, sizeof(footer_mark_str), auto_dump_footer, auto_dump_mark);
+ strnfmt(header_mark_str, sizeof(header_mark_str), auto_dump_header, auto_dump_mark.data());
+ strnfmt(footer_mark_str, sizeof(footer_mark_str), auto_dump_footer, auto_dump_mark.data());
size_t mark_len = strlen(footer_mark_str);
FILE *orig_fff;
- orig_fff = angband_fopen(orig_file, "r");
+ orig_fff = angband_fopen(orig_file, FileOpenMode::READ);
if (!orig_fff) {
return;
}
angband_fclose(tmp_fff);
if (changed) {
- tmp_fff = angband_fopen(tmp_file, "r");
- orig_fff = angband_fopen(orig_file, "w");
+ tmp_fff = angband_fopen(tmp_file, FileOpenMode::READ);
+ orig_fff = angband_fopen(orig_file, FileOpenMode::WRITE);
while (!angband_fgets(tmp_fff, buf, sizeof(buf))) {
fprintf(orig_fff, "%s\n", buf);
}