1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-ad,v 1.1 2006/01/08 19:21:18 joerg Exp $
--- src/config/kbdbind.c.orig 2003-06-06 23:13:25.000000000 +0000
+++ src/config/kbdbind.c
@@ -216,7 +216,7 @@ struct strtonum {
};
static long
-strtonum(struct strtonum *table, char *str)
+my_strtonum(struct strtonum *table, char *str)
{
struct strtonum *rec;
@@ -263,7 +263,7 @@ static struct strtonum keymap_table[] =
static int
read_keymap(unsigned char *keymap)
{
- return strtonum(keymap_table, keymap);
+ return my_strtonum(keymap_table, keymap);
}
unsigned char *
@@ -306,7 +306,7 @@ static struct strtonum key_table[] = {
long
read_key(unsigned char *key)
{
- return (strlen(key) == 1) ? *key : strtonum(key_table, key);
+ return (strlen(key) == 1) ? *key : my_strtonum(key_table, key);
}
static unsigned char *
@@ -440,7 +440,7 @@ static struct strtonum action_table[] =
static int
read_action(unsigned char *action)
{
- return strtonum(action_table, action);
+ return my_strtonum(action_table, action);
}
unsigned char *
|
