Improved error message phrasings.

diff --git a/src/draw_wins.c b/src/draw_wins.c
index ad5ad123cd08d78ec2905a5784b329e4ac9693d0..a72978cee1003393859ea7a3f4dc76936113e069 100644 (file)
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -223,7 +223,7 @@ extern void draw_keys_win(struct Win * win)
                            win->frame.size.y - 1);
     uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */
     char * keydesc = malloc(keydescwidth), * keyname;
-    char * err_hint = "Trouble drawing scroll hint in Keybindings Window.";
+    char * err_hint = "Trouble with draw_scroll_hint() in draw_keys_win().";
     attr_t attri;
     for (y = 0; y <= world->keyswindata->max && y < win->frame.size.y; y++)
     {

diff --git a/src/keybindings.c b/src/keybindings.c
index 0b5194c4eec8d585a7b024c0acacab65f5da8287..6fabea65ed499074ef9deb3e65077e8572f0ab64 100644 (file)
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -170,7 +170,8 @@ extern char * get_keyname(uint16_t keycode)
 extern void keyswin_mod_key(struct World * world, struct WinMeta * win_meta)
 {
     world->keyswindata->edit = 1;
-    exit_err(draw_all_wins(win_meta), world, "Window drawing error.");
+    exit_err(draw_all_wins(win_meta), world, "Trouble with draw_all_wins() in "
+                                             "keyswin_mod_key().");
     int key = getch();
     if (key < 1000)
     {

diff --git a/src/main.c b/src/main.c
index 229b9d36704a9f76cfc035ebe963e8c72c4d14fb..2ca2c8cb64b0f477c28c9cf1c3093bdb9104cb34 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -73,12 +73,12 @@ int main(int argc, char *argv[])
     init_map_object_defs(&world, "defs");
 
     /* For interactive mode, try to load world state from savefile. */
-    char * err_o = "Error loading game: "
-                   "Unable to open 'savefile' for reading.";
-    char * err_r = "Error loading game: "
-                   "Trouble reading from opened 'savefile'.";
-    char * err_c = "Error loading game: "
-                   "Unable to close opened 'savefile'.";
+    char * err_o = "Trouble loading game (fopen() in main()) / "
+                   "opening 'savefile' for reading.";
+    char * err_r = "Trouble loading game (in main()) / "
+                   "reading from opened 'savefile'.";
+    char * err_c = "Trouble loading game (fclose() in main()) / "
+                   "closing opened 'savefile'.";
     char * savefile = "savefile";
     FILE * file;
     if (1 == world.interactive && 0 == access(savefile, F_OK))
@@ -103,10 +103,10 @@ int main(int argc, char *argv[])
     /* For non-interactive mode, try to load world state from record file. */
     else
     {
-        err_o = "Error loading record file: "
-                "Unable to open file 'record' for reading.";
-        err_r = "Error loading record file: "
-                "Trouble reading from opened file 'record'.";
+        err_o = "Trouble loading record file (fopen() in main()) / "
+                "opening file 'record' for reading.";
+        err_r = "Trouble loading record file (read_uint32_bigendian() in "
+                "main()) / reading from opened file 'record'.";
         char * recordfile = "record";
         world.turn = 1;
         if (0 == world.interactive)
@@ -123,16 +123,17 @@ int main(int argc, char *argv[])
         {
             world.seed = time(NULL);
 
-            err_x        = "Error recording new seed: "
+            err_x        = "Trouble recording new seed: "
                            "A file 'record' already exists, when it shouldn't.";
-            err_o        = "Error recording new seed: "
-                           "Unable to open 'record_tmp' file for writing.";
-            char * err_w = "Error recording new seed: "
-                           "Trouble writing to opened file 'record_tmp'.";
-            err_c        = "Error recording new seed: "
-                           "Unable to close opened file 'record_tmp'.";
-            char * err_m = "Error recording new seed: "
-                           "Unable to rename file 'record_tmp' to 'record'.";
+            err_o        = "Trouble recording new seed (fopen() in main()) / "
+                           "opening'record_tmp' file for writing.";
+            char * err_w = "Trouble recording new seed "
+                           "(write_uint32_bigendian() in main()) / writing to "
+                           "opened file 'record_tmp'.";
+            err_c        = "Trouble recording new seed (fclose() in main()) / "
+                           "closing opened file 'record_tmp'.";
+            char * err_m = "Trouble recording new seed (rename() in main()) : "
+                           "renaming file 'record_tmp' to 'record'.";
             exit_err(!access(recordfile, F_OK), &world, err_x);
             file = fopen(recordfile_tmp, "w");
             exit_err(0 == file, &world, err_o);
@@ -171,7 +172,7 @@ int main(int argc, char *argv[])
     init_keybindings(&world);
     set_cleanup_flag(CLEANUP_KEYBINDINGS);
     struct WinMeta win_meta;
-    char * err_winmem = "Error: Window drawing memory allocation failed.";
+    char * err_winmem = "Trouble with init_win() or draw_all_wins() in main().";
     exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
     struct Win win_keys = init_win(&win_meta, "Keys",
                                    0, 29, &world, draw_keys_win);
@@ -246,7 +247,8 @@ int main(int argc, char *argv[])
                                              &win_map, &win_info, &win_log);
                 if (1 == quit_called)
                 {
-                    err_c = "Error closing read 'record' file.";
+                    err_c = "Trouble closing 'record' file (fclose() in "
+                            "main()).";
                     exit_err(fclose(file), &world, err_c);
                     exit_game(&world);
                 }

diff --git a/src/misc.c b/src/misc.c
index 875e11919802986054ef9eeca71ede9646f8e07c..c38ba0ef73af98995877ce5fa58acfa8709f5f42 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -114,16 +114,16 @@ extern uint16_t center_offset(uint16_t pos, uint16_t mapsize,
 
 extern void turn_over(struct World * world, char action)
 {
-    char * err_open  = "Error recording move: "
-                       "Unable to open file 'record_tmp' for appending.";
-    char * err_write = "Error recording move: "
-                       "Trouble writing to opened file 'record_tmp'.";
-    char * err_close = "Error recording move: "
-                       "Unable to close opened file 'record_tmp'.";
-    char * err_unl   = "Error recording move: "
-                       "Unable to unlink old file 'record'.";
-    char * err_move  = "Error recording move: "
-                        "Unable to rename file 'record_tmp' to 'record'.";
+    char * err_open  = "Trouble in turn_over() with fopen() "
+                       "opening file 'record_tmp' for appending.";
+    char * err_write = "Trouble in turn_over() with write_uint8() "
+                       "writing to opened file 'record_tmp'.";
+    char * err_close = "Trouble in turn_over() with fclose() "
+                       "closing opened file 'record_tmp'.";
+    char * err_unl   = "Trouble in turn_over() with unlink() "
+                       "unlinking old file 'record'.";
+    char * err_move  = "Trouble in turn_over() with rename() "
+                       "renaming file 'record_tmp' to 'record'.";
     char * recordfile_tmp = "record_tmp";
     char * recordfile     = "record";
     if (1 == world->interactive)
@@ -151,16 +151,16 @@ extern void turn_over(struct World * world, char action)
 
 extern void save_game(struct World * world)
 {
-    char * err_open  = "Error saving game: "
-                       "Unable to open file 'savefile_tmp' for writing.";
-    char * err_write = "Error saving game: "
-                       "Trouble writing to opened file 'savefile_tmp'.";
-    char * err_close = "Error saving game: "
-                       "Unable to close opened file 'savefile_tmp'.";
-    char * err_unl   = "Error saving game: "
-                       "Unable to unlink old 'savefile' file.";
-    char * err_move  = "Error saving game: "
-                        "Unable to rename 'file savefile_tmp' to 'savefile'.";
+    char * err_open  = "Trouble in save_game() with fopen() "
+                       "opening file 'savefile_tmp' for writing.";
+    char * err_write = "Trouble in save_game() "
+                       "writing to opened file 'savefile_tmp'.";
+    char * err_close = "Trouble in save_game() with fclose() "
+                       "closing opened file 'savefile_tmp'.";
+    char * err_unl   = "Trouble in save_game() with unlink() "
+                       "unlinking old 'savefile' file.";
+    char * err_move  = "Trouble in save_game() with rename() "
+                       "renaming 'file savefile_tmp' to 'savefile'.";
     char * savefile_tmp = "savefile_tmp";
     char * savefile     = "savefile";
     FILE * file = fopen(savefile_tmp, "w");
@@ -259,9 +259,10 @@ extern uint8_t meta_keys(int key, struct World * world,
                          struct Win * win_map, struct Win * win_info,
                          struct Win * win_log)
 {
-    char * err_toggle = "Trouble toggling window.";
-    char * err_shift  = "Trouble shifting window.";
-    char * err_resize = "Trouble resizing window.";
+    char * err_toggle = "Trouble with toggle_window() in meta_keys().";
+    char * err_shift  = "Trouble with shift_active_win() in meta_keys().";
+    char * err_resize = "Trouble with growshrink_active_window() in "
+                        "meta_keys().";
     if (key == get_action_key(world->keybindings, "quit"))
     {
         return 1;

diff --git a/src/rexit.c b/src/rexit.c
index 802de341f44c98e09e61c6eab8510a2830b51eb4..d8defc2b4a34a7c5cae5d6896e597566e4698073 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -68,9 +68,9 @@ extern void exit_err(uint8_t err, struct World * world, char * msg)
     cleanup(world);
     if (NULL == msg)
     {
-        msg = "Some error encountered. Aborted.";
+        msg = "Details unknown.";
     }
-    printf("%s\n", msg);
+    printf("Aborted PlomRogue due to error. %s\n", msg);
     perror("errno states");
     exit(EXIT_FAILURE);
 }