home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server: Improve comment description on dijkstra_map().
[plomrogue]
/
src
/
client
/
keybindings.c
diff --git
a/src/client/keybindings.c
b/src/client/keybindings.c
index 4231da492531cf8a832f5e5bc817a8427e724682..ba8dc4f061564e28de75ab5aba99eaffcc2728b4 100644
(file)
--- a/
src/client/keybindings.c
+++ b/
src/client/keybindings.c
@@
-5,6
+5,7
@@
#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
#include <stdio.h> /* FILE, sprintf() */
#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
#include <stdio.h> /* FILE, sprintf() */
+#include "../common/rexit.h" /* exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "windows.h" /* draw_all_wins() */
#include "world.h" /* global world */
#include "../common/try_malloc.h" /* try_malloc() */
#include "windows.h" /* draw_all_wins() */
#include "world.h" /* global world */
@@
-51,7
+52,8
@@
static uint8_t try_keycode(uint16_t keycode_given, char * keyname,
{
if (keycode_given == keycode_match)
{
{
if (keycode_given == keycode_match)
{
- sprintf(keyname, "%s", keyname_match);
+ int test = sprintf(keyname, "%s", keyname_match);
+ exit_trouble(test < 0, __func__, "sprintf");
return 1;
}
return 0;
return 1;
}
return 0;
@@
-77,16
+79,15
@@
extern struct Command * get_command_to_keycode(struct KeyBindingDB * kbdb,
extern char * get_keyname_to_keycode(uint16_t keycode)
{
extern char * get_keyname_to_keycode(uint16_t keycode)
{
- char * f_name = "get_name_to_keycode()";
- char * keyname = try_malloc(10, f_name); /* max keyname length + 1 */
+ char * keyname = try_malloc(10, __func__); /* max keyname length + 1 */
if (32 < keycode && keycode < 127)
{
if (32 < keycode && keycode < 127)
{
-
sprintf(keyname, "%c", keycode
);
+
exit_trouble(sprintf(keyname, "%c", keycode) < 0, __func__, "sprintf"
);
}
else if (keycode >= KEY_F0 && keycode <= KEY_F(63))
{
uint16_t f = keycode - KEY_F0;
}
else if (keycode >= KEY_F0 && keycode <= KEY_F(63))
{
uint16_t f = keycode - KEY_F0;
-
sprintf(keyname, "F%d", f)
;
+
exit_trouble(sprintf(keyname, "F%d", f) < 0, __func__, "sprintf");
;
}
else if ( try_keycode(keycode, keyname, 9, "TAB")
|| try_keycode(keycode, keyname, 10, "RETURN")
}
else if ( try_keycode(keycode, keyname, 9, "TAB")
|| try_keycode(keycode, keyname, 10, "RETURN")
@@
-108,7
+109,7
@@
extern char * get_keyname_to_keycode(uint16_t keycode)
}
else
{
}
else
{
-
sprintf(keyname, "(unknown)
");
+
exit_trouble(sprintf(keyname, "(unknown)") < 0, __func__, "sprintf
");
}
return keyname;
}
}
return keyname;
}