some cleanup; -- noch

This commit is contained in:
norayr 2017-05-17 01:38:08 +04:00
parent 0063418fc0
commit b8c7ed3f90

11
IRC.Mod
View file

@ -243,7 +243,6 @@ PROCEDURE Send*(VAR inst: instance; str: ARRAY OF CHAR): BOOLEAN;
VAR VAR
b : BOOLEAN; b : BOOLEAN;
BEGIN BEGIN
(*terminateLine(str);*)
b := Internet.Write(inst.connection, str); b := Internet.Write(inst.connection, str);
IF b THEN IF b THEN
Out.String("sent:"); Out.Ln; Out.String("sent:"); Out.Ln;
@ -294,6 +293,7 @@ VAR
str : ARRAY msgLen OF CHAR; str : ARRAY msgLen OF CHAR;
b : BOOLEAN; b : BOOLEAN;
BEGIN BEGIN
zeroStr(str);
formModeLine(str, inst.nick); formModeLine(str, inst.nick);
b := Send(inst, str); b := Send(inst, str);
END Mode; END Mode;
@ -302,6 +302,7 @@ PROCEDURE ModeAndJoin*(VAR inst : instance);
VAR str: ARRAY msgLen OF CHAR; VAR str: ARRAY msgLen OF CHAR;
b: BOOLEAN; b: BOOLEAN;
BEGIN BEGIN
zeroStr(str);
formModeJoinLine(str, inst.nick, inst.channelList^[0]); formModeJoinLine(str, inst.nick, inst.channelList^[0]);
b := Send(inst, str); b := Send(inst, str);
END ModeAndJoin; END ModeAndJoin;
@ -311,6 +312,7 @@ VAR
str: ARRAY msgLen OF CHAR; str: ARRAY msgLen OF CHAR;
b: BOOLEAN; b: BOOLEAN;
BEGIN BEGIN
zeroStr(str);
formJoinLine(str, inst.channelList^[0]); formJoinLine(str, inst.channelList^[0]);
Out.String("SENDING JOIN LINE"); Out.Ln; Out.String("SENDING JOIN LINE"); Out.Ln;
b := Send(inst, str); b := Send(inst, str);
@ -328,11 +330,8 @@ BEGIN
Disconnect(inst); Disconnect(inst);
b := FALSE; b := FALSE;
ELSE ELSE
IF serverMsg(line) THEN IF serverMsg(line) THEN (* string starts with ':' *)
IF rplWelcome(line) THEN IF rplWelcome(line) THEN (* strting contains '001' *)
(*IF contains(line, eofMOTD) THEN*)
(*Mode(inst);
Join(inst);*)
ModeAndJoin(inst); ModeAndJoin(inst);
ELSE ELSE
inst.callback(line); inst.callback(line);