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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
$NetBSD: patch-src_mksary.c,v 1.1 2018/06/29 17:01:16 taca Exp $
* Avoid name confliction.
* Avoid using deprecated function.
--- src/mksary.c.orig 2004-06-11 18:57:28.000000000 +0000
+++ src/mksary.c
@@ -59,10 +59,10 @@ CodesetFunc codeset_func_tab[] = {
static SaryIpointFunc dispatch_codeset_func (const gchar *codeset);
static SaryBuilder* new_builder (const gchar *file_name,
const gchar *array_name);
-static void index (SaryBuilder *builder,
+static void sary_index (SaryBuilder *builder,
const gchar *file_name,
const gchar *array_name);
-static void sort (SaryBuilder *builder,
+static void sary_sort (SaryBuilder *builder,
const gchar *file_name,
const gchar *array_name);
static void index_and_sort (SaryBuilder *builder,
@@ -121,7 +121,7 @@ dispatch_codeset_func (const gchar *code
CodesetFunc *cursor;
for (cursor = codeset_func_tab; cursor->codeset != NULL; cursor++) {
- if (g_strcasecmp(cursor->codeset, codeset) == 0) {
+ if (g_ascii_strcasecmp(cursor->codeset, codeset) == 0) {
return cursor->ipoint_func;
}
}
@@ -149,7 +149,7 @@ new_builder (const gchar *file_name, con
}
static void
-index (SaryBuilder *builder,
+sary_index (SaryBuilder *builder,
const gchar *file_name,
const gchar *array_name)
{
@@ -165,7 +165,7 @@ index (SaryBuilder *builder,
static void
-sort (SaryBuilder *builder,
+sary_sort (SaryBuilder *builder,
const gchar *file_name,
const gchar *array_name)
{
@@ -186,8 +186,8 @@ index_and_sort (SaryBuilder *builder,
const gchar *file_name,
const gchar *array_name)
{
- index(builder, file_name, array_name);
- sort(builder, file_name, array_name);
+ sary_index(builder, file_name, array_name);
+ sary_sort(builder, file_name, array_name);
}
static void
@@ -358,7 +358,7 @@ parse_options (int argc, char **argv)
show_help();
break;
case 'i':
- process = index;
+ process = sary_index;
break;
case 'l':
ipoint_func = sary_ipoint_line;
@@ -373,7 +373,7 @@ parse_options (int argc, char **argv)
progress_func = progress_quiet;
break;
case 's':
- process = sort;
+ process = sary_sort;
break;
case 't':
if (optarg) {
|
