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
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
$FreeBSD$
--- kernellib/kernel/sys/driver.c.orig 2011-07-30 14:15:13.000000000 -0700
+++ kernellib/kernel/sys/driver.c 2011-07-30 14:16:23.000000000 -0700
@@ -596,16 +596,16 @@
* NAME: _touch()
* DESCRIPTION: touch an object that has been flagged with call_touch()
*/
-private int _touch(mixed *tls, object obj, string function)
+private int _touch(mixed *tls, object obj, string funcname)
{
- return objectd->touch(obj, function);
+ return objectd->touch(obj, funcname);
}
/*
* NAME: touch()
* DESCRIPTION: wrapper for _touch()
*/
-static int touch(object obj, string function)
+static int touch(object obj, string funcname)
{
mixed *tls;
string prog;
@@ -614,7 +614,7 @@
if (!previous_object()) {
tls = allocate(tls_size);
} else if (KERNEL()) {
- prog = function_object(function, obj);
+ prog = function_object(funcname, obj);
if (prog && sscanf(prog, "/kernel/%*s") != 0 &&
status()[ST_STACKDEPTH] < 0) {
/*
@@ -625,7 +625,7 @@
}
}
- return _touch(tls, obj, function);
+ return _touch(tls, obj, funcname);
}
return FALSE;
}
@@ -795,7 +795,7 @@
private void _runtime_error(mixed tls, string str, int caught, int ticks,
mixed **trace)
{
- string line, function, progname, objname;
+ string line, funcname, progname, objname;
int i, sz, len;
object user;
@@ -836,10 +836,10 @@
line = line[strlen(line) - 4 ..];
}
- function = trace[i][TRACE_FUNCTION];
- len = strlen(function);
+ funcname = trace[i][TRACE_FUNCTION];
+ len = strlen(funcname);
if (progname == AUTO && i != sz - 1 && len > 3) {
- switch (function[.. 2]) {
+ switch (funcname[.. 2]) {
case "bad":
case "_F_":
case "_Q_":
@@ -847,7 +847,7 @@
}
}
if (len < 17) {
- function += " "[len ..];
+ funcname += " "[len ..];
}
objname = trace[i][TRACE_OBJNAME];
@@ -857,10 +857,10 @@
objname[len] == '#') {
objname = objname[len ..];
}
- str += line + " " + function + " " + progname + " (" + objname +
+ str += line + " " + funcname + " " + progname + " (" + objname +
")\n";
} else {
- str += line + " " + function + " " + progname + "\n";
+ str += line + " " + funcname + " " + progname + "\n";
}
}
@@ -914,7 +914,7 @@
static void atomic_error(string str, int atom, int ticks)
{
mixed **trace;
- string line, function, progname, objname;
+ string line, funcname, progname, objname;
int i, sz, len;
object obj;
@@ -936,10 +936,10 @@
line = line[strlen(line) - 4 ..];
}
- function = trace[i][TRACE_FUNCTION];
- len = strlen(function);
+ funcname = trace[i][TRACE_FUNCTION];
+ len = strlen(funcname);
if (progname == AUTO && i != sz - 1 && len > 3) {
- switch (function[.. 2]) {
+ switch (funcname[.. 2]) {
case "bad":
case "_F_":
case "_Q_":
@@ -947,7 +947,7 @@
}
}
if (len < 17) {
- function += " "[len ..];
+ funcname += " "[len ..];
}
objname = trace[i][TRACE_OBJNAME];
@@ -957,10 +957,10 @@
objname[len] == '#') {
objname = objname[len ..];
}
- str += line + " " + function + " " + progname + " (" + objname +
+ str += line + " " + funcname + " " + progname + " (" + objname +
")\n";
} else {
- str += line + " " + function + " " + progname + "\n";
+ str += line + " " + funcname + " " + progname + "\n";
}
}
|
