Fixed typo in SERVER_COMMANDS.

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 69278e8393631a351326ae725e682a304a267ab7..bb86bb95ffd161a999d03acf2d36ecb364ecb16c 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -8,7 +8,7 @@
 #include <stdio.h> /* sprintf() */
 #include <stdlib.h> /* free() */
 #include <string.h> /* memset(), strchr(), strdup/(), strlen() */
-#include "../common/rexit.h" /* exit_err() */
+#include "../common/rexit.h" /* exit_err(), exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */
 #include "windows.h" /* yx_uint16, Win, get_win_by_id() */
@@ -69,7 +69,6 @@ static void draw_titled_keybinding_list(char * title, struct Win * win,
 
 static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x)
 {
-    char * f_name = "try_resize_winmap()";
     if (win->winmap_size.y >= new_size_y && win->winmap_size.x >= new_size_x)
     {
         return;
@@ -84,7 +83,7 @@ static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x)
     }
     chtype * old_winmap = win->winmap;
     uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x;
-    win->winmap = try_malloc(new_size, f_name);
+    win->winmap = try_malloc(new_size, __func__);
     uint16_t y, x;
     for (y = 0; y < new_size_y; y++)
     {
@@ -183,8 +182,9 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
     uint16_t len_line = strlen(line);
     char * separator = last ? "" : " / ";
     uint32_t len_line_new = len_line + strlen(separator);
-    char line_new[len_line_new];
-    sprintf(line_new, "%s%s", line, separator);
+    char * line_new = try_malloc(len_line_new, __func__);
+    int test = sprintf(line_new, "%s%s", line, separator);
+    exit_trouble(test < 0, __func__, "sprintf");
     uint16_t x = 0;
     uint16_t y;
     uint32_t z;
@@ -204,6 +204,7 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
             try_resize_winmap(win, y + 1 + 1, win->winmap_size.x);
         }
     }
+    free(line_new);
     *offset = x;
 }
 
@@ -257,11 +258,11 @@ static void draw_text_from_bottom(struct Win * win, char * text)
 
 static char * get_kb_line(struct KeyBinding * kb)
 {
-    char * f_name = "get_kb_line()";
     char * keyname = get_keyname_to_keycode(kb->keycode);
     uint16_t size = strlen(keyname) + 3 + strlen(kb->command->dsc_long) + 1;
-    char * kb_line = try_malloc(size, f_name);
-    sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long);
+    char * kb_line = try_malloc(size, __func__);
+    int test = sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long);
+    exit_trouble(test < 0, __func__, "sprintf");
     free(keyname);
     return kb_line;
 }
@@ -358,10 +359,12 @@ extern void draw_win_info(struct Win * win)
     char * dsc_turn      = "Turn: ";
     char * dsc_hitpoints = "\nHitpoints: ";
     uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3;
-    char text[maxl + 1];
-    sprintf(text, "%s%d%s%d",
-            dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints);
+    char * text = try_malloc(maxl + 1, __func__);
+    int test = sprintf(text, "%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints,
+                                         world.player_lifepoints);
+    exit_trouble(test < 0, __func__, "sprintf");
     add_text_with_linebreaks(win, text);
+    free(text);
 }
 
 
@@ -458,13 +461,15 @@ extern void draw_winconf_geometry(struct Win * win)
     char * title = "Window's geometry:\n\n";
     char * h_title = "Height to save: ";
     char h_value[6 + 1];                       /* 6: int16_t value max strlen */
-    sprintf(h_value, "%d", win->target_height);
+    int test = sprintf(h_value, "%d", win->target_height);
+    exit_trouble(test < 0, __func__, "sprintf");
     char * h_plus = " (width in cells)\n\n";
     char * h_minus = " (negative diff: cells to screen width)\n\n";
     char * h_type = (1 == win->target_height_type) ? h_minus : h_plus;
     char * w_title = "Width to save: ";
     char w_value[6 + 1];
-    sprintf(w_value, "%d", win->target_width);
+    test = sprintf(w_value, "%d", win->target_width);
+    exit_trouble(test < 0, __func__, "sprintf");
     char * w_plus = "(height in cells)\n\n";
     char * w_minus = " (negative diff: cells to screen height)\n\n";
     char * w_type = (1 == win->target_width_type)  ? w_minus : w_plus;
@@ -475,8 +480,10 @@ extern void draw_winconf_geometry(struct Win * win)
                          + strlen(h_title) + strlen(h_value) + strlen(h_type)
                          + strlen(w_title) + strlen(w_value) + strlen(w_type)
                          + strlen(breaks_title) + strlen(breaks_type);
-    char text[text_size + 1];
-    sprintf(text, "%s%s%s%s%s%s%s%s%s", title, h_title, h_value, h_type,
-            w_title, w_value, w_type, breaks_title, breaks_type);
+    char * text = try_malloc(text_size + 1, __func__);
+    test = sprintf(text, "%s%s%s%s%s%s%s%s%s", title, h_title, h_value, h_type,
+                        w_title, w_value, w_type, breaks_title, breaks_type);
+    exit_trouble(test < 0, __func__, "sprintf");
     add_text_with_linebreaks(win, text);
+    free(text);
 }