summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/services.h2
-rw-r--r--include/users.h2
-rw-r--r--src/core/bs_badwords.c6
-rw-r--r--src/core/cs_access.c8
-rw-r--r--src/core/cs_list.c10
-rw-r--r--src/core/cs_xop.c2
-rw-r--r--src/core/hs_list.c6
-rw-r--r--src/core/ns_list.c6
-rw-r--r--src/news.c3
-rw-r--r--src/operserv.c4
-rw-r--r--src/protocol/bahamut.c2
11 files changed, 26 insertions, 25 deletions
diff --git a/include/services.h b/include/services.h
index 339efa151..f8e8334bf 100644
--- a/include/services.h
+++ b/include/services.h
@@ -915,7 +915,7 @@ struct channel_ {
EList *invites;
struct c_userlist *users;
- int16 usercount;
+ uint16 usercount;
BanData *bd;
diff --git a/include/users.h b/include/users.h
index c8fc7e343..315a6c508 100644
--- a/include/users.h
+++ b/include/users.h
@@ -49,7 +49,7 @@ class User : public Extensible
struct u_chanlist *chans; /* Channels user has joined */
struct u_chaninfolist *founder_chans; /* Channels user has identified for */
- short invalid_pw_count; /* # of invalid password attempts */
+ unsigned short invalid_pw_count; /* # of invalid password attempts */
time_t invalid_pw_time; /* Time of last invalid password */
time_t lastmemosend; /* Last time MS SEND command used */
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index e1518c51c..92561c26b 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -6,8 +6,8 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
+ * Based on the original code of Services by Andy Church.
+ *
* $Id$
*
*/
@@ -62,7 +62,7 @@ int do_badwords(User * u)
ChannelInfo *ci;
BadWord *bw;
- int i;
+ unsigned i;
int need_args = (cmd
&& (!stricmp(cmd, "LIST") || !stricmp(cmd, "CLEAR")));
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index b70192c02..486c482e4 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -6,8 +6,8 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
+ * Based on the original code of Services by Andy Church.
+ *
* $Id$
*
*/
@@ -138,7 +138,7 @@ int do_access(User * u)
NickCore *nc;
ChanAccess *access;
- int i;
+ unsigned i;
int level = 0, ulev;
int is_list = (cmd && stricmp(cmd, "LIST") == 0);
int is_servadmin = is_services_admin(u);
@@ -393,7 +393,7 @@ int do_access(User * u)
free(ci->access);
ci->access = NULL;
ci->accesscount = 0;
-
+
send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick);
notice_lang(s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name);
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index a6e81d33c..7c2d3fba2 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -6,8 +6,8 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
+ * Based on the original code of Services by Andy Church.
+ *
* $Id$
*
*/
@@ -61,7 +61,7 @@ int do_list(User * u)
int spattern_size;
char *spattern;
ChannelInfo *ci;
- int nchans, i;
+ unsigned nchans, i;
char buf[BUFSIZE];
int is_servadmin = is_services_admin(u);
int count = 0, from = 0, to = 0, tofree = 0;
@@ -130,11 +130,11 @@ int do_list(User * u)
if (stricmp(keyword, "NOEXPIRE") == 0)
matchflags |= CI_NO_EXPIRE;
}
-
+
spattern_size = (strlen(pattern) + 2) * sizeof(char);
spattern = (char *)smalloc(spattern_size);
snprintf(spattern, spattern_size, "#%s", pattern);
-
+
notice_lang(s_ChanServ, u, CHAN_LIST_HEADER, pattern);
for (i = 0; i < 256; i++) {
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index bc724913f..a757f7968 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -234,7 +234,7 @@ int do_xop(User * u, const char *xname, int xlev, int *xmsgs)
NickAlias *na;
NickCore *nc;
- int i;
+ unsigned i;
int change = 0;
short ulev;
int is_list = (cmd && stricmp(cmd, "LIST") == 0);
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 1fc8d226e..46db3ab40 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -6,8 +6,8 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
+ * Based on the original code of Services by Andy Church.
+ *
* $Id$
*
*/
@@ -62,7 +62,7 @@ int listOut(User * u)
int from = 0, to = 0;
char *tmp = NULL;
char *s = NULL;
- int display_counter = 0;
+ unsigned display_counter = 0;
HostCore *head = NULL;
HostCore *current;
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 795eba051..f00160226 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -6,8 +6,8 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
+ * Based on the original code of Services by Andy Church.
+ *
* $Id$
*
*/
@@ -77,7 +77,7 @@ int do_list(User * u)
char *keyword;
NickAlias *na;
NickCore *mync;
- int nnicks, i;
+ unsigned nnicks, i;
char buf[BUFSIZE];
int is_servadmin = is_services_admin(u);
int16 matchflags = 0;
diff --git a/src/news.c b/src/news.c
index 24660dfac..9b5ff3db6 100644
--- a/src/news.c
+++ b/src/news.c
@@ -276,7 +276,8 @@ void display_news(User * u, int16 type)
}
}
} else {
- int i, count = 0;
+ int i;
+ unsigned count = 0;
for (i = nnews - 1; i >= 0; i--) {
if (count >= NewsCount)
diff --git a/src/operserv.c b/src/operserv.c
index 76c8d014d..938fdc3a7 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -168,7 +168,7 @@ void load_os_dbase(void)
fatal("Read error on %s", ChanDBName);
return;
}
-
+
SAFE(read_int32(&maxusercnt, f));
SAFE(read_int32(&tmp32, f));
maxusertime = tmp32;
@@ -1408,7 +1408,7 @@ void runDefCon(void)
char *defconReverseModes(const char *modes)
{
char *newmodes = NULL;
- int i = 0;
+ unsigned i = 0;
if (!modes) {
return NULL;
}
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 424a5da8b..9854adeaf 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -524,7 +524,7 @@ class BahamutIRCdProto : public IRCDProto
/* SVSHOLD - set */
void SendSVSHold(const char *nick)
{
- send_cmd(ServerName, "SVSHOLD %s %ld :%s", nick, (unsigned int)NSReleaseTimeout, "Being held for registered user");
+ send_cmd(ServerName, "SVSHOLD %s %u :%s", nick, (unsigned int)NSReleaseTimeout, "Being held for registered user");
}
/* SVSHOLD - release */