From 7a3fd562cb80da8881a5cebeab0641fcb7b2af30 Mon Sep 17 00:00:00 2001 From: Markus Uhlin Date: Sat, 4 Oct 2025 13:55:04 +0200 Subject: Refer to the array indices by using enums --- FICS/adminproc.c | 12 +++++------- FICS/board.c | 3 ++- FICS/command.c | 4 ++-- FICS/fics_addplayer.c | 2 +- FICS/gamedb.c | 6 +++--- FICS/lists.c | 3 ++- FICS/makerank.c | 3 ++- FICS/playerdb.c | 30 ++++++------------------------ FICS/ratings.c | 11 +++-------- FICS/utils.c | 6 ++---- 10 files changed, 28 insertions(+), 52 deletions(-) diff --git a/FICS/adminproc.c b/FICS/adminproc.c index 9f192bc..27d6ce3 100644 --- a/FICS/adminproc.c +++ b/FICS/adminproc.c @@ -189,8 +189,8 @@ create_news_file(int p, param_list param, int admin) msnprintf(filename, sizeof filename, "%s/adminnews.%d", news_dir, param[0].val.integer); - fd = open(filename, g_open_flags[1], g_open_modes); - if (fd < 0) + if ((fd = open(filename, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0) return COM_FAILED; else if ((fp = fdopen(fd, "w")) != NULL) { fprintf(fp, "%s\n", param[1].val.string); @@ -206,8 +206,8 @@ create_news_file(int p, param_list param, int admin) msnprintf(filename, sizeof filename, "%s/news.%d", news_dir, param[0].val.integer); - fd = open(filename, g_open_flags[1], g_open_modes); - if (fd < 0) + if ((fd = open(filename, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0) return COM_FAILED; else if ((fp = fdopen(fd, "w")) != NULL) { fprintf(fp, "%s\n", param[1].val.string); @@ -230,9 +230,7 @@ add_item(char *new_item, char *filename) msnprintf(tmp_file, sizeof tmp_file, "%s/.tmp.idx", news_dir); - fd = open(tmp_file, g_open_flags[1], g_open_modes); - - if (fd < 0) + if ((fd = open(tmp_file, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) return 0; else if ((new_fp = fdopen(fd, "w")) == NULL) { close(fd); diff --git a/FICS/board.c b/FICS/board.c index 2423024..a119604 100644 --- a/FICS/board.c +++ b/FICS/board.c @@ -1329,7 +1329,8 @@ wild_update(int style) msnprintf(fname, sizeof fname, "%s/wild/%d", board_dir, style); - if ((fd = open(fname, g_open_flags[1], g_open_modes)) < 0) { + if ((fd = open(fname, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0) { warn("%s: can't write file name: %s", __func__, fname); return; } else if ((fp = fdopen(fd, "w")) == NULL) { diff --git a/FICS/command.c b/FICS/command.c index df5d4c2..a69b80f 100644 --- a/FICS/command.c +++ b/FICS/command.c @@ -1311,7 +1311,7 @@ commands_init(void) fp = afp = NULL; snprintf(fname, sizeof fname, "%s/commands", comhelp_dir); - if ((fd[0] = open(fname, g_open_flags[1], g_open_modes)) < 0) { + if ((fd[0] = open(fname, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) { warn("%s: open: %s", __func__, fname); return; } else if ((fp = fdopen(fd[0], "w")) == NULL) { @@ -1323,7 +1323,7 @@ commands_init(void) snprintf(fname, sizeof fname, "%s/admin_commands", adhelp_dir); - if ((fd[1] = open(fname, g_open_flags[1], g_open_modes)) < 0) { + if ((fd[1] = open(fname, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) { warn("%s: open: %s", __func__, fname); goto clean_up; } else if ((afp = fdopen(fd[1], "w")) == NULL) { diff --git a/FICS/fics_addplayer.c b/FICS/fics_addplayer.c index 160b28d..2a65fc3 100644 --- a/FICS/fics_addplayer.c +++ b/FICS/fics_addplayer.c @@ -65,7 +65,7 @@ add_handle_to_list(const char *handle) snprintf(path, sizeof path, "%s/admin", DEFAULT_LISTS); - if ((fd = open(path, g_open_flags[0], g_open_modes)) < 0) { + if ((fd = open(path, g_open_flags[OPFL_APPEND], g_open_modes)) < 0) { warn("%s: unable to open %s", __func__, path); return; } else if ((fp = fdopen(fd, "a")) == NULL) { diff --git a/FICS/gamedb.c b/FICS/gamedb.c index f3a351b..ccbc1f1 100644 --- a/FICS/gamedb.c +++ b/FICS/gamedb.c @@ -1573,7 +1573,7 @@ game_save(int g) msnprintf(lname, sizeof lname, "%s/%c/%s-%s", adj_dir, bp->login[0], wp->login, bp->login); - if ((fd = open(fname, g_open_flags[1], g_open_modes)) < 0) { + if ((fd = open(fname, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) { warn("%s: open: %s", __func__, fname); return -1; } else if ((fp = fdopen(fd, "w")) == NULL) { @@ -1834,7 +1834,7 @@ write_g_out(int g, char *file, int maxlines, int isDraw, char *EndSymbol, count = (count + 1) % 100; - if ((fd = open(file, g_open_flags[0], g_open_modes)) < 0) { + if ((fd = open(file, g_open_flags[OPFL_APPEND], g_open_modes)) < 0) { warn("%s: open: %s", __func__, file); return; } else if ((fp = fdopen(fd, "a")) == NULL) { @@ -1967,7 +1967,7 @@ addjournalitem(int p, char count2, char *WhiteName2, int WhiteRating2, mstrlcpy(fname2, fname, sizeof fname2); mstrlcat(fname2, ".w", sizeof fname2); - if ((fd = open(fname2, g_open_flags[1], g_open_modes)) < 0) { + if ((fd = open(fname2, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) { warn("%s: open", __func__); return; } else if ((fp2 = fdopen(fd, "w")) == NULL) { diff --git a/FICS/lists.c b/FICS/lists.c index c11d75b..97ee525 100644 --- a/FICS/lists.c +++ b/FICS/lists.c @@ -435,7 +435,8 @@ list_addsub(int p, char *list, char *who, int addsub) msnprintf(filename, sizeof filename, "%s/%s", lists_dir, listname); - if ((fd = open(filename, g_open_flags[1], g_open_modes)) < 0) { + if ((fd = open(filename, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0) { fprintf(stderr, "Couldn't save %s list.\n", listname); } else if ((fp = fdopen(fd, "w")) == NULL) { fprintf(stderr, "Couldn't save %s list.\n", listname); diff --git a/FICS/makerank.c b/FICS/makerank.c index 076e16e..aa92ae0 100644 --- a/FICS/makerank.c +++ b/FICS/makerank.c @@ -315,7 +315,8 @@ makerank(void) snprintf(fName, sizeof fName, "%s/rank.%s", DEFAULT_STATS, rnames[rtype]); - if ((fd = open(fName, g_open_flags[1], g_open_modes)) < 0 || + if ((fd = open(fName, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0 || (fp = fdopen(fd, "w")) == NULL) err(1, "%s: rank file open error", __func__); diff --git a/FICS/playerdb.c b/FICS/playerdb.c index 9919bfd..d8a5d96 100644 --- a/FICS/playerdb.c +++ b/FICS/playerdb.c @@ -1207,10 +1207,7 @@ player_markdeleted(int p) parray[p].login[0], parray[p].login); xrename(__func__, fname, fname2); - errno = 0; - fd = open(fname2, g_open_flags[0], g_open_modes); - - if (fd < 0) { + if ((fd = open(fname2, g_open_flags[OPFL_APPEND], g_open_modes)) < 0) { warn("%s: open", __func__); return -1; } else if ((fp = fdopen(fd, "a")) != NULL) { // Touch the file @@ -1346,10 +1343,7 @@ player_save(int p) snprintf(fname, sizeof fname, "%s/%c/%s", player_dir, parray[p].login[0], parray[p].login); - errno = 0; - fd = open(fname, g_open_flags[1], g_open_modes); - - if (fd < 0) { + if ((fd = open(fname, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) { warn("%s: Problem opening file %s for write", __func__, fname); return -1; } else if ((fp = fdopen(fd, "w")) == NULL) { @@ -1643,10 +1637,7 @@ write_p_inout(int inout, int p, char *file, int maxlines) FILE *fp; int fd; - errno = 0; - fd = open(file, g_open_flags[0], g_open_modes); - - if (fd < 0) { + if ((fd = open(file, g_open_flags[OPFL_APPEND], g_open_modes)) < 0) { warn("%s: open", __func__); return; } else if ((fp = fdopen(fd, "a")) == NULL) { @@ -2638,10 +2629,7 @@ player_add_message(int top, int fromp, char *message) if (lines_file(fname) >= MAX_MESSAGES && parray[top].adminLevel == 0) return -1; - errno = 0; - fd = open(fname, g_open_flags[0], g_open_modes); - - if (fd < 0) + if ((fd = open(fname, g_open_flags[OPFL_APPEND], g_open_modes)) < 0) return -1; else if ((fp = fdopen(fd, "a")) == NULL) { close(fd); @@ -2816,10 +2804,7 @@ WriteMsgFile(int p, textlist *Head) GetMsgFile(p, fName, sizeof fName, __func__); - errno = 0; - fd = open(fName, g_open_flags[1], g_open_modes); - - if (fd < 0) + if ((fd = open(fName, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) return 0; else if ((fp = fdopen(fd, "w")) == NULL) { close(fd); @@ -3237,10 +3222,7 @@ player_add_comment(int p_by, int p_to, char *comment) snprintf(fname, sizeof fname, "%s/player_data/%c/%s.%s", stats_dir, parray[p_to].login[0], parray[p_to].login, "comments"); - errno = 0; - fd = open(fname, g_open_flags[0], g_open_modes); - - if (fd < 0) { + if ((fd = open(fname, g_open_flags[OPFL_APPEND], g_open_modes)) < 0) { warn("%s: open", __func__); return -1; } else if ((fp = fdopen(fd, "a")) == NULL) { diff --git a/FICS/ratings.c b/FICS/ratings.c index a85776d..8113c6d 100644 --- a/FICS/ratings.c +++ b/FICS/ratings.c @@ -418,10 +418,7 @@ save_ratings(void) snprintf(fname, sizeof fname, "%s/newratingsV%d_data", stats_dir, STATS_VERSION); - errno = 0; - fd = open(fname, g_open_flags[1], g_open_modes); - - if (fd < 0) { + if ((fd = open(fname, g_open_flags[OPFL_WRITE], g_open_modes)) < 0) { warn("%s: can't write ratings data", __func__); return; } else if ((fp = fdopen(fd, "w")) == NULL) { @@ -1501,10 +1498,8 @@ UpdateRank(int type, char *addName, statistics *sNew, char *delName) snprintf(TmpRankFile, sizeof TmpRankFile, "%s/tmpRank", sdir); - errno = 0; - fd = open(TmpRankFile, g_open_flags[1], g_open_modes); - - if (fd < 0) { + if ((fd = open(TmpRankFile, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0) { warn("%s: open", __func__); fclose(fp); return; diff --git a/FICS/utils.c b/FICS/utils.c index 4da2411..a48f4bd 100644 --- a/FICS/utils.c +++ b/FICS/utils.c @@ -905,10 +905,8 @@ truncate_file(char *file, int lines) if (trunc) { int fd; - errno = 0; - fd = open(file, g_open_flags[1], g_open_modes); - - if (fd < 0) { + if ((fd = open(file, g_open_flags[OPFL_WRITE], + g_open_modes)) < 0) { warn("%s: open", __func__); return 1; } else if ((fp = fdopen(fd, "w")) == NULL) { -- cgit v1.2.3