Remove all trailing whitespace

This commit is contained in:
Rylee Fowler 2014-07-08 18:08:51 -04:00
parent e044e2827d
commit f9999a12bd
20 changed files with 68 additions and 68 deletions

View File

@ -274,7 +274,7 @@ static void cs_cmd_badwords(sourceinfo_t *si, int parc, char *parv[])
bw = n->data;
if (!irccasecmp(bw->badword, word))
{
{
command_success_nodata(si, _("\2%s\2 has already been entered into the bad word list."), word);
return;
}
@ -319,7 +319,7 @@ static void cs_cmd_badwords(sourceinfo_t *si, int parc, char *parv[])
command_fail(si, fault_nosuch_target, _("There are no badwords set in this channel."));
return;
}
MOWGLI_ITER_FOREACH_SAFE(n, tn, l->head)
{
bw = n->data;
@ -346,13 +346,13 @@ static void cs_cmd_badwords(sourceinfo_t *si, int parc, char *parv[])
{
char buf[BUFSIZE];
struct tm tm;
if (!chanacs_source_has_flag(mc, si, CA_ACLVIEW))
{
command_fail(si, fault_noprivs, _("You are not authorized to perform this command."));
return;
}
if (l == NULL)
{
command_fail(si, fault_nosuch_target, _("There are no badwords set in this channel."));

View File

@ -75,7 +75,7 @@ static void cs_cmd_fregister(sourceinfo_t *si, int parc, char *parv[])
command_fail(si, fault_notverified, _("You need to verify your email address before you may register channels."));
return;
}
/* make sure it isn't already registered */
if ((mc = mychan_find(name)))
{
@ -85,7 +85,7 @@ static void cs_cmd_fregister(sourceinfo_t *si, int parc, char *parv[])
command_fail(si, fault_alreadyexists, _("\2%s\2 is already registered."), mc->name);
return;
}
/* make sure the channel exists */
if (!(c = channel_find(name)))
{

View File

@ -173,7 +173,7 @@ static void os_cmd_dnsblexempt(sourceinfo_t *si, int parc, char *parv[])
de = n->data;
if (!irccasecmp(de->ip, ip))
{
{
command_success_nodata(si, _("\2%s\2 has already been entered into the DNSBL exempts list."), ip);
return;
}
@ -345,7 +345,7 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, user_t *u)
blcptr->dns_query.callback = blacklist_dns_callback;
/* A sscanf worked fine for chary for many years, it'll be fine here */
sscanf(u->ip, "%d.%d.%d.%d", &ip[3], &ip[2], &ip[1], &ip[0]);
sscanf(u->ip, "%d.%d.%d.%d", &ip[3], &ip[2], &ip[1], &ip[0]);
/* becomes 2.0.0.127.torbl.ahbl.org or whatever */
snprintf(buf, sizeof buf, "%d.%d.%d.%d.%s", ip[0], ip[1], ip[2], ip[3], blptr->host);
@ -514,7 +514,7 @@ static void osinfo_hook(sourceinfo_t *si)
if (action)
command_success_nodata(si, "Action taken when a user is an a DNSBL: %s", action);
else
else
command_success_nodata(si, "Action taken when a user is an a DNSBL: %s", "None");
MOWGLI_ITER_FOREACH(n, blacklist_list.head)

View File

@ -66,7 +66,7 @@ static void my_rhandler(connection_t * cptr)
static void do_listen(connection_t *cptr)
{
connection_t *newptr;
connection_t *newptr;
newptr = connection_accept_tcp(cptr, my_rhandler, NULL);
slog(LG_DEBUG, "do_listen(): accepted %d", cptr->fd);
}

View File

@ -70,7 +70,7 @@ static void my_rhandler(connection_t * cptr)
static void do_listen(connection_t *cptr)
{
connection_t *newptr;
connection_t *newptr;
newptr = connection_accept_tcp(cptr, my_rhandler, NULL);
slog(LG_DEBUG, "do_listen(): accepted %d", cptr->fd);
}

View File

@ -106,7 +106,7 @@ static void hook_user_identify(user_t *u)
{
/* if they have an existing cloak, don't do anything */
if ((metadata_find(u->myuser, "private:usercloak")) || (me.hidehostsuffix == NULL))
return;
return;
/* they do not, add one. */
user_add_host(u->myuser);

View File

@ -10,7 +10,7 @@
DECLARE_MODULE_V1
(
"contrib/ircd_announceserv", false, _modinit, _moddeinit,
PACKAGE_STRING,
PACKAGE_STRING,
"JD and Taros"
);

View File

@ -1,7 +1,7 @@
/*
* Copyright (c) 2006 William Pitcock, et al.
* Rights to this code are as documented in doc/LICENSE.
*
*
* LoveServ implementation.
*
*/

View File

@ -8,9 +8,9 @@
#include "atheme-compat.h"
/* Changed to allow for dynamic configuration, to configure this, set
* chanserv::mlocktweak to the mode string you want set on channels as
* they are registered. Keep in mind that +nt will be applied as well,
/* Changed to allow for dynamic configuration, to configure this, set
* chanserv::mlocktweak to the mode string you want set on channels as
* they are registered. Keep in mind that +nt will be applied as well,
* so if you do not want +n or +t, negate them in the configuration.
* - Quora
*/

View File

@ -44,20 +44,20 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
mowgli_node_t *n;
mymemo_t *memo;
service_t *memoserv;
/* Grab args */
char *target = parv[0];
char *m = parv[1];
/* Arg validation */
if (!target || !m)
{
command_fail(si, fault_needmoreparams,
command_fail(si, fault_needmoreparams,
STR_INSUFFICIENT_PARAMS, "FSEND");
command_fail(si, fault_needmoreparams,
command_fail(si, fault_needmoreparams,
"Syntax: FSEND <user> <memo>");
return;
}
@ -79,9 +79,9 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
/* Check for memo text length -- includes/common.h */
if (strlen(m) >= MEMOLEN)
{
command_fail(si, fault_badparams,
command_fail(si, fault_badparams,
"Please make sure your memo is less than %d characters", MEMOLEN);
return;
}
@ -93,7 +93,7 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
command_fail(si, fault_badparams, _("Your memo contains invalid characters."));
return;
}
memoserv = service_find("memoserv");
if (memoserv == NULL)
memoserv = si->service;
@ -101,17 +101,17 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
if (*target != '#' && *target != '!')
{
/* See if target is valid */
if (!(tmu = myuser_find_ext(target)))
if (!(tmu = myuser_find_ext(target)))
{
command_fail(si, fault_nosuch_target,
command_fail(si, fault_nosuch_target,
"\2%s\2 is not registered.", target);
return;
}
si->smu->memo_ratelimit_num++;
si->smu->memo_ratelimit_time = CURRTIME;
/* Check to make sure target inbox not full */
if (tmu->memos.count >= me.mdlimit)
{
@ -121,7 +121,7 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
}
logcommand(si, CMDLOG_ADMIN, "FSEND: to \2%s\2", entity(tmu)->name);
/* Malloc and populate struct */
memo = smalloc(sizeof(mymemo_t));
memo->sent = CURRTIME;
@ -129,7 +129,7 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
mowgli_strlcpy(memo->sender,entity(si->smu)->name,NICKLEN);
mowgli_strlcpy(memo->text, "[FORCE] ", FMEMOLEN);
mowgli_strlcat(memo->text, m, FMEMOLEN);
/* Create a linked list node and add to memos */
n = mowgli_node_create();
mowgli_node_add(memo, n, &tmu->memos);
@ -140,7 +140,7 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
{
compat_sendemail(si->su, tmu, EMAIL_MEMO, tmu->email, memo->text);
}
/* Note: do not disclose other nicks they're logged in with
* -- jilles
*

View File

@ -126,7 +126,7 @@ static void ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[])
// First character of a potential match; remember it's location
itempos = i;
}
j++;
if (!remove1[j])
{
@ -138,15 +138,15 @@ static void ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[])
j = 0;
}
}
if (remove1[j])
{
command_fail(si, fault_badparams, "%s is not on your AJOIN list.", parv[1]);
return;
}
listlen = i;
// listlen is the length of the list, rmlen is the length of the item to remove, itempos is the beginning of that item.
if (!list[itempos + rmlen])
{

View File

@ -65,7 +65,7 @@ static void clean_nickname(user_t *u)
while (*p++)
{
if (IsUpper(*p))
*p = ToLower(*p);
*p = ToLower(*p);
}
if (is_nickname_lame(nickbuf))

View File

@ -19,7 +19,7 @@ static void ns_cmd_generatehash(sourceinfo_t *si, int parc, char *parv[]);
command_t ns_generatehash = { "GENERATEHASH", "Generates a hash for SOPER.",
AC_NONE, 1, ns_cmd_generatehash, { .path = "contrib/generatehash" } };
void _modinit(module_t *m)
{
service_named_bind_command("nickserv", &ns_generatehash);
@ -38,7 +38,7 @@ static void ns_cmd_generatehash(sourceinfo_t *si, int parc, char *parv[])
if (parc < 1)
{
command_fail(si, fault_needmoreparams, STR_INSUFFICIENT_PARAMS, "GENERATEHASH");
command_fail(si, fault_needmoreparams, _("Syntax: GENERATEHASH <password>"));
command_fail(si, fault_needmoreparams, _("Syntax: GENERATEHASH <password>"));
return;
}

View File

@ -19,7 +19,7 @@ static void ns_cmd_generatepass(sourceinfo_t *si, int parc, char *parv[]);
command_t ns_generatepass = { "GENERATEPASS", "Generates a random password.",
AC_NONE, 1, ns_cmd_generatepass, { .path = "contrib/generatepass" } };
void _modinit(module_t *m)
{
service_named_bind_command("nickserv", &ns_generatepass);
@ -34,7 +34,7 @@ static void ns_cmd_generatepass(sourceinfo_t *si, int parc, char *parv[])
{
int n = 0;
char *newpass;
if (parc >= 1)
n = atoi(parv[0]);

View File

@ -5,7 +5,7 @@
* This file contains code for blocking registrations of guest nicks.
* Particularly for use with webchat clients.
*
* To actually use this, add a something like the following to
* To actually use this, add a something like the following to
* the nickserv {} block of your atheme.conf:
* guestnicks {
* "mib_";

View File

@ -56,7 +56,7 @@ static void check_registration(hook_user_register_check_t *hdata)
/* attempt to resolve host (fallback to A) */
if((host = gethostbyname(domain)) == NULL)
{
slog(LG_INFO, "REGISTER: mxcheck: no A/MX records for %s - "
slog(LG_INFO, "REGISTER: mxcheck: no A/MX records for %s - "
"REGISTER failed", domain);
command_fail(hdata->si, fault_noprivs, "Sorry, \2%s\2 does not exist, "
"I can't send mail there. Please check and try again.", domain);
@ -73,16 +73,16 @@ int count_mx (const char *host)
int l;
l = res_query (host, ns_c_any, ns_t_mx, nsbuf, sizeof (nsbuf));
if (l < 0)
if (l < 0)
{
return 0;
}
else
}
else
{
ns_initparse (nsbuf, l, &amsg);
l = ns_msg_count (amsg, ns_s_an);
}
return l;
}

View File

@ -64,7 +64,7 @@ static void childproc_cb(pid_t pid, int status, void *data)
if (WEXITSTATUS(status) == 1)
{
slog(LG_INFO, "REGISTER: mxcheck: no A/MX records for %s - "
slog(LG_INFO, "REGISTER: mxcheck: no A/MX records for %s - "
"REGISTER failed", domain);
myuser_notice(nicksvs.nick, mu, "Sorry, \2%s\2 does not exist, "
"I can't send mail there. Please check and try again.", domain);
@ -136,16 +136,16 @@ int count_mx (const char *host)
int l;
l = res_query (host, ns_c_any, ns_t_mx, nsbuf, sizeof (nsbuf));
if (l < 0)
if (l < 0)
{
return 0;
}
else
}
else
{
ns_initparse (nsbuf, l, &amsg);
l = ns_msg_count (amsg, ns_s_an);
}
return l;
}

View File

@ -119,7 +119,7 @@ aknl_nickhook(hook_user_nick_t *data)
if (*username == '~')
username++;
if (mowgli_patricia_retrieve(akillalllist, u->nick) != NULL &&
if (mowgli_patricia_retrieve(akillalllist, u->nick) != NULL &&
mowgli_patricia_retrieve(akillalllist, username) != NULL &&
mowgli_patricia_retrieve(akillalllist, u->gecos) != NULL)
doit = true;

View File

@ -30,11 +30,11 @@ static void testcmd_command_success_string(sourceinfo_t *si, const char *result,
command_t os_testcmd = { "TESTCMD", "Executes a command without a user_t.",
AC_NONE, 3, os_cmd_testcmd, { .path = "contrib/testcmd" } };
struct sourceinfo_vtable testcmd_vtable = {
.description = "testcmd",
.cmd_fail = testcmd_command_fail,
.cmd_success_nodata = testcmd_command_success_nodata,
.cmd_success_string = testcmd_command_success_string
struct sourceinfo_vtable testcmd_vtable = {
.description = "testcmd",
.cmd_fail = testcmd_command_fail,
.cmd_success_nodata = testcmd_command_success_nodata,
.cmd_success_string = testcmd_command_success_string
};
void _modinit(module_t *m)

View File

@ -100,7 +100,7 @@ char *reason_extract(char **args)
(*args)++;
break;
}
(*args)++;
}
@ -132,7 +132,7 @@ static void *trace_regexp_prepare(char **args)
domain = scalloc(sizeof(trace_query_regexp_domain_t), 1);
domain->pattern = regex_extract(*args, &(*args), &domain->flags);
domain->regex = regex_create(domain->pattern, domain->flags);
return domain;
}
@ -221,7 +221,7 @@ static void *trace_glob_prepare(char **args)
{
char *pattern;
trace_query_glob_domain_t *domain;
return_val_if_fail(args != NULL, NULL);
return_val_if_fail(*args != NULL, NULL);
@ -232,7 +232,7 @@ static void *trace_glob_prepare(char **args)
domain->pattern = sstrdup(pattern);
*args = strtok(NULL, "");
return domain;
}
@ -622,7 +622,7 @@ static trace_action_t *trace_akill_prepare(sourceinfo_t *si, char **args)
/* Extract a token, but only if there's one to remove.
* Otherwise, this would clip a word off the reason. */
token = 0;
s = *args;
s = *args;
if (!strncasecmp(s, "!T", 2) || !strncasecmp(s, "!P", 2))
{
if (s[2] == ' ')
@ -658,17 +658,17 @@ static trace_action_t *trace_akill_prepare(sourceinfo_t *si, char **args)
;
else
duration = 0;
if (duration == 0)
return NULL;
}
else if (token == 'p')
duration = 0;
reason = reason_extract(args);
if (reason == NULL)
return NULL;
a = scalloc(sizeof(trace_action_akill_t), 1);
trace_action_init(&a->base, si);
a->duration = duration;
@ -843,7 +843,7 @@ static void os_cmd_trace(sourceinfo_t *si, int parc, char *parv[])
MOWGLI_ITER_FOREACH_SAFE(n, tn, crit.head)
{
trace_query_domain_t *q = (trace_query_domain_t *) n->data;
q->cons->cleanup(q);
q->cons->cleanup(q);
}
actcons->cleanup(act, succeeded);