home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use not f_name variable but __func__, standardize function name writing.
[plomrogue]
/
src
/
client
/
keybindings.c
diff --git
a/src/client/keybindings.c
b/src/client/keybindings.c
index b0b7c7a06fc496ee5cb9baa5cd5af8c70632d14a..ba8dc4f061564e28de75ab5aba99eaffcc2728b4 100644
(file)
--- a/
src/client/keybindings.c
+++ b/
src/client/keybindings.c
@@
-50,11
+50,10
@@
static struct KeyBindingDB * char_selected_kb_db(char c)
static uint8_t try_keycode(uint16_t keycode_given, char * keyname,
uint16_t keycode_match, char * keyname_match)
{
static uint8_t try_keycode(uint16_t keycode_given, char * keyname,
uint16_t keycode_match, char * keyname_match)
{
- char * f_name = "try_keycode()";
if (keycode_given == keycode_match)
{
int test = sprintf(keyname, "%s", keyname_match);
if (keycode_given == keycode_match)
{
int test = sprintf(keyname, "%s", keyname_match);
- exit_trouble(test < 0,
f_name, "sprintf()
");
+ exit_trouble(test < 0,
__func__, "sprintf
");
return 1;
}
return 0;
return 1;
}
return 0;
@@
-80,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)
{
- exit_trouble(sprintf(keyname, "%c", keycode) < 0,
f_name, "sprintf()
");
+ 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;
- exit_trouble(sprintf(keyname, "F%d", f) < 0,
f_name, "sprintf()
");;
+ 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")
@@
-111,7
+109,7
@@
extern char * get_keyname_to_keycode(uint16_t keycode)
}
else
{
}
else
{
- exit_trouble(sprintf(keyname, "(unknown)") < 0,
f_name, "sprintf()
");
+ exit_trouble(sprintf(keyname, "(unknown)") < 0,
__func__, "sprintf
");
}
return keyname;
}
}
return keyname;
}