Variablen 'in' umbenannt.
'in' ist zukuenftig ein reserviertes Schluesselwort
im Driver.
Change-Id: Ifffd8c6f7a4f64e5b9f2b22ff6a04547ca58cf6e
diff --git a/mail/nedit.c b/mail/nedit.c
index 79cc640..909dc97 100644
--- a/mail/nedit.c
+++ b/mail/nedit.c
@@ -426,21 +426,21 @@
}
static int ShowWritten(int f, int l, int num) {
- string s, t, c, p, in;
+ string s, t, c, p, indent;
int i;
if (num) {
if (l >= 100) {
p = "%3d%s%s";
- in = " ";
+ indent = " ";
}
else {
p = "%2d%s%s";
- in = " ";
+ indent = " ";
}
}
else
- in = "";
+ indent = "";
for (t="", i=l-1; i>=f; i--) {
if (i == cur)
@@ -464,9 +464,9 @@
}
else c= " ";
- s="Das hast Du bisher geschrieben:\n"+in+" \
+ s="Das hast Du bisher geschrieben:\n"+indent+" \
--------------------------\n\
-"+t+in+c+"\
+"+t+indent+c+"\
--------------------------";
({void})this_player()->More(s,0,symbol_function("input_func",this_object()));
return 1;
diff --git a/p/service/padreic/mnpc/mnpc.c b/p/service/padreic/mnpc/mnpc.c
index 3f02e9f..e89c0ed 100644
--- a/p/service/padreic/mnpc/mnpc.c
+++ b/p/service/padreic/mnpc/mnpc.c
@@ -36,10 +36,10 @@
return i;
}
-varargs int move(object|string dest, int meth, string dir, string out,
- string in)
+varargs int move(object|string dest, int meth, string dir, string textout,
+ string textin)
{
- int i=npc::move(dest, meth, dir, out, in);
+ int i=npc::move(dest, meth, dir, textout, textin);
if (i!=1) return i;
moving::mnpc_move();
return 1;
diff --git a/std/more.c b/std/more.c
index e2cf039..3635e88 100644
--- a/std/more.c
+++ b/std/more.c
@@ -89,11 +89,11 @@
return l;
}
-varargs int eval_command(mixed in, mixed pinfo)
+varargs int eval_command(mixed input, mixed pinfo)
{
cprompt = "";
- if(stringp(in))
- switch(in)
+ if(stringp(input))
+ switch(input)
{
case "?":
write(MSG_HELP+"\n");
@@ -117,26 +117,26 @@
default:
{
int l;
- if(l = to_int(in))
+ if(l = to_int(input))
{
if(l > pinfo[MAXL] || l < 1) return (cprompt = MSG_ILLEGAL, 0);
pinfo[CURL] = l;
break;
}
- if(sizeof(in) && in[0] == '/')
+ if(sizeof(input) && input[0] == '/')
{
- if(sizeof(in) == 1)
+ if(sizeof(input) == 1)
{
if(!pinfo[REGX]) return (cprompt = MSG_NO_REGX, 0);
}
- else pinfo[REGX] = in[1..];
+ else pinfo[REGX] = input[1..];
if(l = search(pinfo)) pinfo[CURL] = l;
else return (cprompt = MSG_NOT_FOUND, 0);
}
- else return ::eval_command(in, pinfo);
+ else return ::eval_command(input, pinfo);
break;
}
}
- else return ::eval_command(in, pinfo);
+ else return ::eval_command(input, pinfo);
return ::eval_command(-1, pinfo);
}
diff --git a/std/util/input.c b/std/util/input.c
index 1e1a6f5..32e909f 100644
--- a/std/util/input.c
+++ b/std/util/input.c
@@ -21,10 +21,10 @@
input_to("done", INPUT_PROMPT, prompttext, prompt, pargs, ctrl, ctrlargs);
}
-void done(string in, mixed prompt, mixed pargs, mixed ctrl, mixed ctrlargs)
+void done(string input, mixed prompt, mixed pargs, mixed ctrl, mixed ctrlargs)
{
if(closurep(ctrl) &&
- apply(ctrl, ({ in }) + (pointerp(ctrlargs) ? ctrlargs : ({}))))
+ apply(ctrl, ({ input }) + (pointerp(ctrlargs) ? ctrlargs : ({}))))
return;
input(prompt, pargs, ctrl, ctrlargs);
}
diff --git a/std/util/pager.c b/std/util/pager.c
index f3219fa..abd5e63 100644
--- a/std/util/pager.c
+++ b/std/util/pager.c
@@ -48,18 +48,18 @@
}
-varargs int eval_command(mixed in, mixed pinfo)
+varargs int eval_command(mixed input, mixed pinfo)
{
string cprompt, tmp;
cprompt = "";
- if(in == "q" || in == "x")
+ if(input == "q" || input == "x")
{
if(closurep(pinfo[CTRL])) apply(pinfo[CTRL], pinfo[CARG]);
return 1;
}
else
- if(!in || (stringp(in) && !sizeof(in))) pinfo[CURL] += pinfo[PAGE];
- else if(in != -1) return 0;
+ if(!input || (stringp(input) && !sizeof(input))) pinfo[CURL] += pinfo[PAGE];
+ else if(input != -1) return 0;
if(pinfo[CURL] >= pinfo[MAXL])
return (call(pinfo[CTRL], pinfo[CARG]), 1);