psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

pointless name collision

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2011-05-21 18:48:24 +02:00
parent c75d508dae
commit a21b0024ef
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
world/net/psyc/circuit.c
View file

@ -365,10 +365,10 @@ varargs int msg(string source, string mc, string data,
if (target) buf += ":_target\t"+ target +"\n"; if (target) buf += ":_target\t"+ target +"\n";
} }
#endif /* !NEW_RENDER */ #endif /* !NEW_RENDER */
rc = psyc_render(source, mc, data, vars, showingLog, target); rc = render_psyc(source, mc, data, vars, showingLog, target);
unless (rc) return 0; unless (rc) return 0;
buf += rc; buf += rc;
P4(("psyc_render %O for %O\n", rc, buf)) P4(("render_psyc %O for %O\n", rc, buf))
#if 0 #if 0
# ifdef NEW_LINE # ifdef NEW_LINE
buf += "\n" S_GLYPH_PACKET_DELIMITER "\n"; buf += "\n" S_GLYPH_PACKET_DELIMITER "\n";

4
world/net/psyc/library.i
View file

@ -398,11 +398,11 @@ int psyc_sendmsg(mixed target, string mc, mixed data, mapping vars,
buf = S_GLYPH_PACKET_DELIMITER "\n" buf = S_GLYPH_PACKET_DELIMITER "\n"
":_source\t"+ sname +"\n" ":_source\t"+ sname +"\n"
":_target\t"+ target +"\n"; ":_target\t"+ target +"\n";
t = psyc_render(source, mc, data, vars, showingLog, target); t = render_psyc(source, mc, data, vars, showingLog, target);
unless (t) return 0; unless (t) return 0;
buf += t; buf += t;
#else #else
buf = psyc_render(source, mc, data, vars, showingLog, target); buf = render_psyc(source, mc, data, vars, showingLog, target);
unless (buf) return 0; unless (buf) return 0;
#endif /* NEW_RENDER */ #endif /* NEW_RENDER */

4
world/net/psyc/render.i
View file

@ -138,10 +138,10 @@ static int build_header(string key, mixed val, mapping vars) {
return 0; return 0;
} }
static varargs string psyc_render(mixed source, string mc, mixed data, static varargs string render_psyc(mixed source, string mc, mixed data,
mapping vars, int showingLog, vastring target) { mapping vars, int showingLog, vastring target) {
// vaobject obj, vastring target, vaint hascontext) // vaobject obj, vastring target, vaint hascontext)
P4(("%O psyc_render %O for %O\n", ME, vars, previous_object())) P4(("%O render_psyc %O for %O\n", ME, vars, previous_object()))
string t, context; string t, context;
int needLen = 0; int needLen = 0;
#ifndef NEW_LINE #ifndef NEW_LINE

2
world/net/spyc/circuit.c
View file

@ -322,7 +322,7 @@ varargs int msg(string source, string mc, string data,
string buf = ""; string buf = "";
unless(vars) vars = ([ ]); unless(vars) vars = ([ ]);
buf = psyc_render(source, mc, data, vars, showingLog, target); buf = render_psyc(source, mc, data, vars, showingLog, target);
#ifdef _flag_log_sockets_SPYC #ifdef _flag_log_sockets_SPYC
log_file("RAW_SPYC", "« %O\n%s\n", ME, buf); log_file("RAW_SPYC", "« %O\n%s\n", ME, buf);
#endif #endif