diff --git a/fortune-mod/CMakeLists.txt b/fortune-mod/CMakeLists.txt
index 54e295d..9ed00fb 100644
--- a/fortune-mod/CMakeLists.txt
+++ b/fortune-mod/CMakeLists.txt
@@ -111,7 +111,7 @@ INCLUDE ("${CMAKE_SOURCE_DIR}/cmake/rinutils_bootstrap.cmake")
 RINUTILS_SET_UP_FLAGS()
 
 IF ("$ENV{FCS_CLANG}")
-    SET (_kept_sorted_whitelists "-Wno-cast-align -Wno-cast-qual -Wno-comma -Wno-declaration-after-statement -Wno-disabled-macro-expansion -Wno-documentation -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-extra-semi-stmt -Wno-gnu-statement-expression -Wno-implicit-fallthrough -Wno-language-extension-token -Wno-padded -Wno-pass-failed -Wno-unused-parameter -Wno-used-but-marked-unused -Wno-vla")
+    SET (_kept_sorted_whitelists "-Wno-cast-align -Wno-cast-qual -Wno-comma -Wno-declaration-after-statement -Wno-disabled-macro-expansion -Wno-documentation -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-extra-semi-stmt -Wno-gnu-statement-expression -Wno-implicit-fallthrough -Wno-language-extension-token -Wno-padded -Wno-pass-failed -Wno-unsafe-buffer-usage -Wno-unused-parameter -Wno-used-but-marked-unused -Wno-vla")
     ADD_DEFINITIONS("-Weverything ${_kept_sorted_whitelists}")
     # ADD_DEFINITIONS("-Weverything")
 ENDIF ()
diff --git a/fortune-mod/util/randstr.c b/fortune-mod/util/randstr.c
index 15637eb..aec8743 100644
--- a/fortune-mod/util/randstr.c
+++ b/fortune-mod/util/randstr.c
@@ -151,17 +151,15 @@ static void get_fort(STRFILE fp)
 
 static void display(FILE *fp, STRFILE table)
 {
-    char *p, ch;
     char line[BUFSIZ];
-    int i;
 
     fseek(fp, (long)Seekpts[0], SEEK_SET);
-    for (i = 0; fgets(line, sizeof line, fp) && !STR_ENDSTRING(line, table);
-         i++)
+    for (; fgets(line, sizeof line, fp) && !STR_ENDSTRING(line, table);)
     {
         if (table.str_flags & STR_ROTATED)
         {
-            for (p = line; (ch = *p); ++p)
+            char ch;
+            for (char *p = line; (ch = *p); ++p)
             {
                 if (isupper(ch))
                 {