Get rid of ^M.

This commit is contained in:
Jilles Tjoelker 2008-04-03 22:00:22 +02:00
parent 24914876eb
commit 9df69d5b30
2 changed files with 64 additions and 64 deletions

View File

@ -70,46 +70,46 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
static int static int
m_away(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) m_away(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
if(MyClient(source_p) && !IsFloodDone(source_p)) if(MyClient(source_p) && !IsFloodDone(source_p))
flood_endgrace(source_p); flood_endgrace(source_p);
if(!IsClient(source_p)) if(!IsClient(source_p))
return 0; return 0;
if(parc < 2 || EmptyString(parv[1])) if(parc < 2 || EmptyString(parv[1]))
{ {
/* Marking as not away */ /* Marking as not away */
if(source_p->user->away != NULL) if(source_p->user->away != NULL)
{ {
/* we now send this only if they were away before --is */ /* we now send this only if they were away before --is */
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
":%s AWAY", use_id(source_p)); ":%s AWAY", use_id(source_p));
sendto_server(client_p, NULL, NOCAPS, CAP_TS6, sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
":%s AWAY", source_p->name); ":%s AWAY", source_p->name);
free_away(source_p); free_away(source_p);
} }
if(MyConnect(source_p)) if(MyConnect(source_p))
sendto_one(source_p, form_str(RPL_UNAWAY), sendto_one(source_p, form_str(RPL_UNAWAY),
me.name, source_p->name); me.name, source_p->name);
return 0; return 0;
} }
if(source_p->user->away == NULL) if(source_p->user->away == NULL)
{ {
allocate_away(source_p); allocate_away(source_p);
rb_strlcpy(source_p->user->away, parv[1], AWAYLEN); rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
":%s AWAY :%s", use_id(source_p), source_p->user->away); ":%s AWAY :%s", use_id(source_p), source_p->user->away);
sendto_server(client_p, NULL, NOCAPS, CAP_TS6, sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
":%s AWAY :%s", source_p->name, source_p->user->away); ":%s AWAY :%s", source_p->name, source_p->user->away);
} else { } else {
rb_strlcpy(source_p->user->away, parv[1], AWAYLEN); rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
} }
if(MyConnect(source_p)) if(MyConnect(source_p))
sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name); sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name);
return 0; return 0;
} }

View File

@ -443,17 +443,17 @@ stats_exempt(struct Client *source_p)
}} }}
static void static void
stats_events_cb(char *str, void *ptr) stats_events_cb(char *str, void *ptr)
{ {
sendto_one_numeric(ptr, RPL_STATSDEBUG, "E :%s", str); sendto_one_numeric(ptr, RPL_STATSDEBUG, "E :%s", str);
} }
static void static void
stats_events (struct Client *source_p) stats_events (struct Client *source_p)
{ {
rb_dump_events(stats_events_cb, source_p); rb_dump_events(stats_events_cb, source_p);
send_pop_queue(source_p); send_pop_queue(source_p);
} }
/* stats_pending_glines() /* stats_pending_glines()
@ -1373,18 +1373,18 @@ stats_l_client(struct Client *source_p, struct Client *target_p,
} }
} }
static void static void
rb_dump_fd_callback(int fd, const char *desc, void *data) rb_dump_fd_callback(int fd, const char *desc, void *data)
{ {
struct Client *source_p = data; struct Client *source_p = data;
sendto_one_numeric(source_p, RPL_STATSDEBUG, "F :fd %-3d desc '%s'", fd, desc); sendto_one_numeric(source_p, RPL_STATSDEBUG, "F :fd %-3d desc '%s'", fd, desc);
} }
static void static void
stats_comm(struct Client *source_p) stats_comm(struct Client *source_p)
{ {
rb_dump_fd(rb_dump_fd_callback, source_p); rb_dump_fd(rb_dump_fd_callback, source_p);
send_pop_queue(source_p); send_pop_queue(source_p);
} }
/* /*