Merge branch 'maint'

* maint:
  Ignore UTF warnings from clang
  Quiet the libelf warning about unused result
  Remove use of register
  Update bdlib

Conflicts:
	lib/bdlib

build/autotools/configure.ac

@@ -30,6 +30,7 @@ EGG_CHECK_CCWALL
 EGG_CHECK_CCPIPE
 CXX_FLAG_CHECK([CXXFLAGS], [-fcolor-diagnostics], [colordiagnostics])
 #CXX_FLAG_CHECK([CXXFLAGS], [-Qunused-arguments], [unusedarguments])
+CXX_FLAG_CHECK([CXXFLAGS], [-Wno-invalid-source-encoding], [invalid_source_encoding])
 CXX_FLAG_CHECK([CXXFLAGS], [-fstack-protector], [stackprotector])
 CXX_FLAG_CHECK([CXXFLAGS], [-fstack-protector-strong], [stackprotectorstrong])
 CXX_FLAG_CHECK([DEBCXXFLAGS], [-fstack-protector-all], [stackprotectorall])

configure

@@ -3532,6 +3532,63 @@ EOF
 
 #CXX_FLAG_CHECK([CXXFLAGS], [-Qunused-arguments], [unusedarguments])
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler understands -Wno-invalid-source-encoding" >&5
+$as_echo_n "checking whether the compiler understands -Wno-invalid-source-encoding... " >&6; }
+if ${egg_cv_prog_cc_invalid_source_encoding+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    ac_saved_flags="$CXXFLAGS"
+    CXXFLAGS="-Werror -Wno-invalid-source-encoding"
+    cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  egg_cv_prog_cc_invalid_source_encoding="yes"
+else
+  egg_cv_prog_cc_invalid_source_encoding="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    CXXFLAGS="$ac_saved_flags"
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_cv_prog_cc_invalid_source_encoding" >&5
+$as_echo "$egg_cv_prog_cc_invalid_source_encoding" >&6; }
+
+  if [ "$egg_cv_prog_cc_invalid_source_encoding" = "yes" ]; then
+    CXXFLAGS="$CXXFLAGS -Wno-invalid-source-encoding"
+  elif [ -n "" ]; then
+      cat << 'EOF' >&2
+configure: error:
+
+  Your OS or C++ compiler does not support -Wno-invalid-source-encoding.
+  This compile flag is required.
+
+EOF
+    exit 1
+  fi
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler understands -fstack-protector" >&5
 $as_echo_n "checking whether the compiler understands -fstack-protector... " >&6; }
 if ${egg_cv_prog_cc_stackprotector+:} false; then :

lib/libelf/lib/update.c

@@ -914,7 +914,10 @@ _elf_output(Elf *elf, int fd, size_t len, off_t (*_elf_write)(Elf*, char*, size_
 
     elf_assert(len);
 #if HAVE_FTRUNCATE
-    ftruncate(fd, 0);
+    if (ftruncate(fd, 0)) {
+	seterr(ERROR_IO_WRITE);
+	return -1;
+    }
 #endif /* HAVE_FTRUNCATE */
 #if HAVE_MMAP
     /*

src/base64.cc

@@ -154,7 +154,7 @@ static void
 b64enc_buf(const unsigned char *data, size_t len, char *dest)
 {
 #define DB(x) ((unsigned char) ((x + i) < len ? data[x + i] : 0))
-  register size_t t, i;
+  size_t t, i;
 
   /* 4-byte blocks */
   for (i = 0, t = 0; i < len; i += NUM_ASCII_BYTES, t += NUM_ENCODED_BYTES) {
@@ -181,7 +181,7 @@ static void
 b64dec_buf(const unsigned char *data, size_t *len, char *dest)
 {
 #define DB(x) ((unsigned char) (x + i < *len ? base64r[(unsigned char) data[x + i]] : 0))
-  register size_t t, i;
+  size_t t, i;
 
   for (i = 0, t = 0; i < *len; i += 4, t += 3) {
     dest[t] = (DB(0) << 2) + (DB(1) >> 4);
@@ -213,8 +213,8 @@ static void
 b64dec_bd_buf(const unsigned char *data, size_t *len, char *dest)
 {
 #define DB(x) ((unsigned char) (x + i < *len ? base64r[(unsigned char) data[x + i]] : 0))
-  register size_t t, i;
-  register int pads = 0;
+  size_t t, i;
+  int pads = 0;
 
   for (i = 0, t = 0; i < *len; i += NUM_ENCODED_BYTES, t += NUM_ASCII_BYTES) {
 

src/botcmd.cc

@@ -786,7 +786,7 @@ static void bot_traced(int idx, char *par)
           ((sock == (-1)) || (sock == dcc[i].sock))) {
 	if (t) {
           int j=0;
-          register char *c = p2;
+          char *c = p2;
           for (; *c != '\0'; c++) if (*c == ':') j++;
 
           time_t tm;
@@ -1065,7 +1065,7 @@ static void bot_part(int idx, char *par)
   }
   if ((partyidx = getparty(bot, sock)) != -1) {
     if (!silent) {
-      register int chan = party[partyidx].chan;
+      int chan = party[partyidx].chan;
 
       if (par[0])
 	chanout_but(-1, chan, "*** (%s) %s %s %s (%s).\n", conf.bot->hub ? bot : "[botnet]", nick,

src/botnet.cc

@@ -784,8 +784,8 @@ void tell_bottree(int idx)
  */
 void dump_links(int z)
 {
-  register int i;
-  register size_t l;
+  int i;
+  size_t l;
   char x[1024] = "";
 
   if (conf.bot->hub || conf.bot->localhub) {
@@ -875,7 +875,7 @@ int users_in_subtree(tand_t *bot)
  */
 int botunlink(int idx, const char *nick, const char *reason)
 {
-  register int i;
+  int i;
   int bots, users;
   tand_t *bot = NULL;
 
@@ -989,7 +989,7 @@ int botlink(char *linker, int idx, char *nick)
     if (idx >= 0)
       dprintf(idx, "That bot is already connected up.\n");
   } else {
-    register int i;
+    int i;
 
     for (i = 0; i < dcc_total; i++) {
       if (dcc[i].type && (dcc[i].user == u) &&
@@ -1187,7 +1187,7 @@ static void tandem_relay_dns_callback(int, void *, const char *, bd::Array<bd::S
 
 /* Relay to another tandembot
  */
-void tandem_relay(int idx, char *nick, register int i)
+void tandem_relay(int idx, char *nick, int i)
 {
   struct userrec *u = get_user_by_handle(userlist, nick);
 
@@ -1336,9 +1336,9 @@ static void tandem_relay_dns_callback(int id, void *client_data, const char *hos
 
 /* Input from user before connect is ready
  */
-static void pre_relay(int idx, char *buf, register int len)
+static void pre_relay(int idx, char *buf, int len)
 {
-  register int tidx = (-1), i;
+  int tidx = (-1), i;
 
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type && dcc[i].type == &DCC_FORK_RELAY && (dcc[i].u.relay->sock == dcc[idx].sock)) {
@@ -1383,7 +1383,7 @@ static void pre_relay(int idx, char *buf, register int len)
  */
 static void failed_pre_relay(int idx)
 {
-  register int tidx = (-1), i;
+  int tidx = (-1), i;
 
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type && (dcc[i].type == &DCC_FORK_RELAY) &&
@@ -1427,9 +1427,9 @@ static void failed_pre_relay(int idx)
   lostdcc(idx);
 }
 
-static void cont_tandem_relay(int idx, char *buf, register int len)
+static void cont_tandem_relay(int idx, char *buf, int len)
 {
-  register int uidx = (-1), i;
+  int uidx = (-1), i;
   struct relay_info *ri = NULL;
 
   for (i = 0; i < dcc_total; i++) {
@@ -1468,7 +1468,7 @@ static void cont_tandem_relay(int idx, char *buf, register int len)
 
 static void eof_dcc_relay(int idx)
 {
-  register int j;
+  int j;
 
   for (j = 0; j < dcc_total; j++)
     if (dcc[j].type && dcc[j].sock == dcc[idx].u.relay->sock)
@@ -1505,7 +1505,7 @@ static void eof_dcc_relay(int idx)
 
 static void eof_dcc_relaying(int idx)
 {
-  register int j, x = dcc[idx].u.relay->sock;
+  int j, x = dcc[idx].u.relay->sock;
 
   putlog(LOG_MISC, "*", "%s [%s]%s/%d", "Lost dcc connection to", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
   killsock(dcc[idx].sock);
@@ -1629,7 +1629,7 @@ static void display_pre_relay(int i, char *other, size_t bufsiz)
 
 static void kill_relay(int idx, void *x)
 {
-  register struct relay_info *p = (struct relay_info *) x;
+  struct relay_info *p = (struct relay_info *) x;
 
   if (p->chat)
     DCC_CHAT.kill(idx, p->chat);
@@ -1652,7 +1652,7 @@ struct dcc_table DCC_RELAY =
 
 static void out_relay(int idx, char *buf, void *x)
 {
-  register struct relay_info *p = (struct relay_info *) x;
+  struct relay_info *p = (struct relay_info *) x;
 
   if (p && p->chat)
     DCC_CHAT.output(idx, buf, p->chat);

src/chanprog.cc

@@ -77,7 +77,7 @@ void rmspace(char *s)
   if (!s || !*s)
     return;
 
-  register char *p = NULL, *q = NULL;
+  char *p = NULL, *q = NULL;
 
   /* Remove trailing whitespaces. */
   for (q = s + strlen(s) - 1; q >= s && egg_isspace(*q); q--)
@@ -96,7 +96,7 @@ void rmspace(char *s)
  */
 memberlist *ismember(const struct chanset_t *chan, const char *nick)
 {
-  register memberlist	*x = NULL;
+  memberlist	*x = NULL;
 
   if (chan && nick && nick[0])
     for (x = chan->channel.member; x && x->nick[0]; x = x->next)
@@ -109,7 +109,7 @@ memberlist *ismember(const struct chanset_t *chan, const char *nick)
  */
 struct chanset_t *findchan(const char *name)
 {
-  register struct chanset_t	*chan = NULL;
+  struct chanset_t	*chan = NULL;
 
   for (chan = chanset; chan; chan = chan->next)
     if (chan->name[0] && !rfc_casecmp(chan->name, name))
@@ -121,7 +121,7 @@ struct chanset_t *findchan(const char *name)
  */
 struct chanset_t *findchan_by_dname(const char *name)
 {
-  register struct chanset_t	*chan = NULL;
+  struct chanset_t	*chan = NULL;
 
   for (chan = chanset; chan; chan = chan->next)
     if (!rfc_casecmp(chan->dname, name))
@@ -139,8 +139,8 @@ struct chanset_t *findchan_by_dname(const char *name)
 struct userrec *check_chanlist(const char *host)
 {
   char				*nick = NULL, *uhost = NULL, buf[UHOSTLEN] = "";
-  register memberlist		*m = NULL;
-  register struct chanset_t	*chan = NULL;
+  memberlist		*m = NULL;
+  struct chanset_t	*chan = NULL;
 
   strlcpy(buf, host, sizeof buf);
   uhost = buf;
@@ -156,8 +156,8 @@ struct userrec *check_chanlist(const char *host)
  */
 struct userrec *check_chanlist_hand(const char *hand)
 {
-  register struct chanset_t	*chan = NULL;
-  register memberlist		*m = NULL;
+  struct chanset_t	*chan = NULL;
+  memberlist		*m = NULL;
 
   for (chan = chanset; chan; chan = chan->next)
     for (m = chan->channel.member; m && m->nick[0]; m = m->next)
@@ -173,8 +173,8 @@ struct userrec *check_chanlist_hand(const char *hand)
  */
 void clear_chanlist(void)
 {
-  register memberlist		*m = NULL;
-  register struct chanset_t	*chan = NULL;
+  memberlist		*m = NULL;
+  struct chanset_t	*chan = NULL;
 
   for (chan = chanset; chan; chan = chan->next)
     for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
@@ -191,8 +191,8 @@ void clear_chanlist(void)
  */
 void clear_chanlist_member(const char *nick)
 {
-  register memberlist		*m = NULL;
-  register struct chanset_t	*chan = NULL;
+  memberlist		*m = NULL;
+  struct chanset_t	*chan = NULL;
 
   for (chan = chanset; chan; chan = chan->next)
     for (m = chan->channel.member; m && m->nick[0]; m = m->next)
@@ -208,8 +208,8 @@ void clear_chanlist_member(const char *nick)
 void set_chanlist(const char *host, struct userrec *rec)
 {
   char				*nick = NULL, *uhost = NULL, buf[UHOSTLEN] = "";
-  register memberlist		*m = NULL;
-  register struct chanset_t	*chan = NULL;
+  memberlist		*m = NULL;
+  struct chanset_t	*chan = NULL;
 
   strlcpy(buf, host, sizeof buf);
   uhost = buf;

src/compat/dirname.c

@@ -10,7 +10,7 @@ char *
 dirname(const char *path)
 {
         static char bname[MAXPATHLEN] = "";
-        register const char *endp = NULL;
+        const char *endp = NULL;
 
         /* Empty or NULL string gets treated as "." */
         if (path == NULL || *path == '\0') {

src/compat/memmem.c

@@ -37,7 +37,7 @@
 void *
 memmem(const void *l, size_t l_len, const void *s, size_t s_len)
 {
-	register char *cur, *last;
+	char *cur, *last;
 	const char *cl = (const char *)l;
 	const char *cs = (const char *)s;
 

src/compat/strlcpy.c

@@ -16,9 +16,9 @@
 size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {
-  register char *d = dst;
-  register const char *s = src;
-  register size_t n = siz;
+  char *d = dst;
+  const char *s = src;
+  size_t n = siz;
 
   /* Copy as many bytes as will fit */
   if (n != 0 && --n != 0) {
@@ -47,9 +47,9 @@ strlcpy(char *dst, const char *src, size_t siz)
 size_t
 strlcat(char *dst, const char *src, size_t siz)
 {
-  register char *d = dst;
-  register const char *s = src;
-  register size_t n = siz;
+  char *d = dst;
+  const char *s = src;
+  size_t n = siz;
   size_t dlen;
 
   /* Find the end of dst and adjust bytes left but don't go past end */

src/dcc.cc

@@ -801,7 +801,7 @@ display_dcc_chat_pass(int idx, char *buf, size_t bufsiz)
 static void
 kill_dcc_general(int idx, void *x)
 {
-  register struct chat_info *p = (struct chat_info *) x;
+  struct chat_info *p = (struct chat_info *) x;
 
   if (p) {
     if (p->buffer) {
@@ -942,7 +942,7 @@ out_dcc_general(int idx, char *buf, void *x)
   char *y = buf;
 
   if (dcc[idx].type == &DCC_CHAT) {
-    register struct chat_info *p = (struct chat_info *) x;
+    struct chat_info *p = (struct chat_info *) x;
 
     strip_mirc_codes(p->strip_flags, buf);
   }
@@ -1700,7 +1700,7 @@ display_dupwait(int idx, char *buf, size_t bufsiz)
 static void
 kill_dupwait(int idx, void *x)
 {
-  register struct dupwait_info *p = (struct dupwait_info *) x;
+  struct dupwait_info *p = (struct dupwait_info *) x;
 
   if (p)
     free(p);
@@ -1726,7 +1726,7 @@ struct dcc_table DCC_DUPWAIT = {
 void
 dupwait_notify(const char *who)
 {
-  for (register int idx = 0; idx < dcc_total; idx++)
+  for (int idx = 0; idx < dcc_total; idx++)
     if (dcc[idx].type && (dcc[idx].type == &DCC_DUPWAIT) && !strcasecmp(dcc[idx].nick, who)) {
       dcc_telnet_pass(idx, dcc[idx].u.dupwait->atr);
       break;

src/match.cc

@@ -60,7 +60,7 @@
 #define PERMATCH (match+saved+sofar)
 
 /* binds matching */
-int _wild_match_per(register unsigned char *m, register unsigned char *n)
+int _wild_match_per(unsigned char *m, unsigned char *n)
 {
   /* null strings should never match */
   if ((m == 0) || (n == 0) || (!*n))
@@ -68,7 +68,7 @@ int _wild_match_per(register unsigned char *m, register unsigned char *n)
 
   unsigned char *ma = m, *lsm = NULL, *lsn = NULL, *lpm = NULL, *lpn = NULL;
   int match = 1, saved = 0, space;
-  register int sofar = 0;
+  int sofar = 0;
 
   while (*n) {
     if (*m == WILDT) {          /* Match >=1 space */
@@ -158,7 +158,7 @@ int _wild_match_per(register unsigned char *m, register unsigned char *n)
 
 
 /* general/host matching */
-int _wild_match(register unsigned char *m, register unsigned char *n)
+int _wild_match(unsigned char *m, unsigned char *n)
 {
   unsigned char *ma = m, *na = n;
 
@@ -168,7 +168,7 @@ int _wild_match(register unsigned char *m, register unsigned char *n)
 
   unsigned char *lsm = NULL, *lsn = NULL;
   int match = 1;
-  register int sofar = 0;
+  int sofar = 0;
 
   /* find the end of each string */
   while (*(++m))

src/match.h

@@ -1,18 +1,18 @@
 #ifndef _MATCH_H
 #define _MATCH_H
 /*
-int wild_match(register unsigned char *, register unsigned char *);
-int wild_match_per(register unsigned char *, register unsigned char *);
+int wild_match(unsigned char *, unsigned char *);
+int wild_match_per(unsigned char *, unsigned char *);
 */
 
 #define wild_match(a,b) _wild_match((unsigned char *)(a),(unsigned char *)(b))
 #define wild_match_per(a,b) _wild_match_per((unsigned char *)(a),(unsigned char *)(b))
 
-int _wild_match(register unsigned char *, register unsigned char *);
-int _wild_match_per(register unsigned char *, register unsigned char *);
+int _wild_match(unsigned char *, unsigned char *);
+int _wild_match_per(unsigned char *, unsigned char *);
 
-//int wild_match(register char *, register char *);
-//int wild_match_per(register char *, register char *);
+//int wild_match(char *, char *);
+//int wild_match_per(char *, char *);
 
 int match_cidr(const char *, const char *);
 

src/misc.cc

@@ -74,9 +74,9 @@ bool		use_exempts = 0;
 /* low-level stuff for other modules
  */
 
-size_t my_strcpy(register char *a, register const char *b)
+size_t my_strcpy(char *a, const char *b)
 {
-  register const char *c = b;
+  const char *c = b;
 
   while (*b)
     *a++ = *b++;
@@ -188,7 +188,7 @@ char *newsplit(char **rest, char delim, bool trim)
   if (!rest)
     return *rest = "";
 
-  register char *o = *rest, *r = NULL;
+  char *o = *rest, *r = NULL;
 
   while (*o == delim)
     ++o;
@@ -240,7 +240,7 @@ char *newsplit(char **rest, char delim, bool trim)
 void maskaddr(const char *s, char *nw, int type)
 {
   int d = type % 5, num = 1;
-  register const char *u = NULL, *h = NULL, *p = NULL;
+  const char *u = NULL, *h = NULL, *p = NULL;
 
   /* Look for user and host.. */
   if ((u = strchr(s, '!')))
@@ -579,10 +579,10 @@ char *str_escape(const char *str, const char divc, const char mask)
  * NOTE: If you look carefully, you'll notice that strchr_unescape()
  *       behaves differently than strchr().
  */
-char *strchr_unescape(char *str, const char divc, register const char esc_char)
+char *strchr_unescape(char *str, const char divc, const char esc_char)
 {
   char buf[3] = "";
-  register char	*s = NULL, *p = NULL;
+  char	*s = NULL, *p = NULL;
 
   for (s = p = str; *s; s++, p++) {
     if (*s == esc_char) {	/* Found escape character.		*/
@@ -605,7 +605,7 @@ char s1_16[3] = "",s2_6[3] = "",s2_7[3] = "";
 /* As strchr_unescape(), but converts the complete string, without
  * searching for a specific delimiter character.
  */
-void str_unescape(char *str, register const char esc_char)
+void str_unescape(char *str, const char esc_char)
 {
   strchr_unescape(str, 0, esc_char);
   return;

src/misc.h

@@ -47,8 +47,8 @@ void show_channels(int, char *);
 void show_banner(int);
 void make_rand_str(char *, size_t, bool = 1);
 char *str_escape(const char *, const char, const char);
-char *strchr_unescape(char *, const char, register const char);
-void str_unescape(char *, register const char);
+char *strchr_unescape(char *, const char, const char);
+void str_unescape(char *, const char);
 int str_isdigit(const char *);
 void kill_bot(char *, char *);
 char *strtolower(char *);

src/mod/channels.mod/chanmisc.cc

@@ -207,7 +207,7 @@ done:
 /* unneeded?
 int CopyAndCollapse(int count, const char *src, char *dst)
 {
-    register char c;
+    char c;
     int numRead; 
     int newCount = 0;
     int backslashCount; 
@@ -315,7 +315,7 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
   if (result)
     result[0] = 0;
 
-  for (register int i = 0; i < items; i++) {
+  for (int i = 0; i < items; i++) {
 /* Chanchar template
     } else if (!strcmp(item[i], "temp")) {
       i++;

src/mod/channels.mod/userchan.cc

@@ -30,7 +30,7 @@ extern struct cmd_pass *cmdpass;
 
 struct chanuserrec *get_chanrec(struct userrec *u, char *chname)
 {
-  for (register struct chanuserrec *ch = u->chanrec; ch; ch = ch->next) 
+  for (struct chanuserrec *ch = u->chanrec; ch; ch = ch->next)
     if (!rfc_casecmp(ch->channel, chname))
       return ch;
   return NULL;

src/mod/compress.mod/compress.cc

@@ -93,7 +93,7 @@ static int is_compressedfile(char *filename)
 
   char buf1[50] = "", buf2[50] = "";
   FILE *fin = NULL;
-  register int len1, len2, i;
+  int len1, len2, i;
 
   /* Read data with zlib routines.
    */

src/mod/irc.mod/chan.cc

@@ -890,7 +890,7 @@ static void refresh_ban_kick(struct chanset_t* chan, memberlist *m, const char *
   /* Check global bans in first cycle and channel bans
      in second cycle. */
   for (int cycle = 0; cycle < 2; cycle++) {
-    for (register maskrec* b = cycle ? chan->bans : global_bans; b; b = b->next) {
+    for (maskrec* b = cycle ? chan->bans : global_bans; b; b = b->next) {
       if (wild_match(b->mask, user) || match_cidr(b->mask, user)) {
         if (role == 1 && chan_hasop(m))
   	  add_mode(chan, '-', 'o', m->nick);	/* Guess it can't hurt.	*/
@@ -1350,11 +1350,11 @@ take_massopline(char *op, char **to_op)
   char *nicks = (char *) my_calloc(1, nicks_len),
        *modes = (char *) my_calloc(1, modes_len),
        *nick = NULL;
-  register bool useop = 0;
+  bool useop = 0;
   static char ret[182] = "";
 
   memset(ret, 0, sizeof(ret));
-  for (register unsigned int i = 0; i < modesperline; i++) {
+  for (unsigned int i = 0; i < modesperline; i++) {
     if (*to_op[0] || op) {
       /* if 'op' then use it, then move on to to_op */
       if (!useop && op) {
@@ -1415,12 +1415,12 @@ do_take(struct chanset_t *chan)
 {
   char to_deop[2048] = "", *to_deop_ptr = to_deop;
   char to_op[2048] = "", *to_op_ptr = to_op;
-  register size_t to_op_len = 0, to_deop_len = 0;
+  size_t to_op_len = 0, to_deop_len = 0;
 
   /* Make lists of who needs to be opped, and who needs to be deopped */
   for (memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
     if (!m->is_me) {
-      register const bool isbot = m->user && m->user->bot ? 1 : 0;
+      const bool isbot = m->user && m->user->bot ? 1 : 0;
 
       /* Avoid countless unneeded operations from strcat/strlen */
       if (isbot && !(m->flags & CHANOP)) {
@@ -1437,10 +1437,10 @@ do_take(struct chanset_t *chan)
 
   size_t deops_len = 0;
   size_t work_len = 0;
-  register short lines = 0;
-  register const unsigned short max_lines = floodless ? 15 : default_alines;
+  short lines = 0;
+  const unsigned short max_lines = floodless ? 15 : default_alines;
   char work[2048] = "", *op = NULL, *modeline = NULL, deops[2048] = "";
-  register unsigned int deopn;
+  unsigned int deopn;
 
   while (to_op_ptr[0] || to_deop_ptr[0]) {
     deops_len = 0;
@@ -1453,7 +1453,7 @@ do_take(struct chanset_t *chan)
       op = newsplit(&to_op_ptr);
 
     /* Prepare a list of modesperline-1 nicks for deop */
-    for (register unsigned int i = 0; i < modesperline; i++) {
+    for (unsigned int i = 0; i < modesperline; i++) {
       if (to_deop_ptr[0] && ((i < (modesperline - 1)) || (!op))) {
         ++deopn; 
         const char *deop_nick = newsplit(&to_deop_ptr);

src/mod/irc.mod/cmdsirc.cc

@@ -78,7 +78,7 @@ static int has_op(int idx, struct chanset_t *chan)
  */
 char *getnick(const char *handle, struct chanset_t *chan)
 {
-  for (register memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
+  for (memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
     member_getuser(m);
     if (m->user && !strcasecmp(m->user->handle, handle))
       return m->nick;
@@ -559,7 +559,7 @@ static void mass_mode(const char* chname, const char* mode, char *par)
 {
   char list[101] = "", buf[2048] = "";
   size_t list_len = 0, buf_len = 0, cnt = 0;
-  register const unsigned short max_lines = floodless ? 15 : default_alines;
+  const unsigned short max_lines = floodless ? 15 : default_alines;
   unsigned short lines = 0;
 
   while (par[0]) {

src/mod/irc.mod/irc.cc

@@ -1643,7 +1643,7 @@ check_expired_chanstuff(struct chanset_t *chan)
 void
 irc_minutely()
 {
-  for (register struct chanset_t *chan = chanset; chan; chan = chan->next) {
+  for (struct chanset_t *chan = chanset; chan; chan = chan->next) {
     warn_pls_take(chan);
     if (server_online) {
       if (!channel_pending(chan)) {
@@ -1686,7 +1686,7 @@ flush_modes()
 
   Context;
 
-  for (register struct chanset_t *chan = chanset; chan; chan = chan->next) {
+  for (struct chanset_t *chan = chanset; chan; chan = chan->next) {
     if (!me_op(chan)) continue;
     for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
       if (m->delay && m->delay <= now) {

src/mod/irc.mod/mode.cc

@@ -803,7 +803,7 @@ got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
   refresh_exempt(chan, mask);
   /* This looks for bans added through bot and tacks on banned: if a description is found */
   if (m && channel_enforcebans(chan)) {
-    register maskrec *b = NULL;
+    maskrec *b = NULL;
     char resn[512] = "";
 
     /* The point of this cycle crap is to first check chan->bans then global_bans for a reason */

src/mod/server.mod/server.cc

@@ -361,7 +361,7 @@ static void calc_penalty(char * msg, size_t len)
     return;
 
   char *cmd = NULL, *par1 = NULL, *par2 = NULL, *par3 = NULL;
-  register int penalty, i, ii;
+  int penalty, i, ii;
 
   cmd = newsplit(&msg);
   if (msg)
@@ -495,7 +495,7 @@ char *splitnicks(char **rest)
   if (!rest)
     return *rest = "";
 
-  register char *o = *rest, *r = NULL;
+  char *o = *rest, *r = NULL;
 
   while (*o == ' ')
     o++;
@@ -1174,9 +1174,9 @@ void server_report(int idx, int details)
 
 static void msgq_clear(struct msgq_head *qh)
 {
-  register struct msgq *qq = NULL;
+  struct msgq *qq = NULL;
 
-  for (register struct msgq *q = qh->head; q; q = qq) {
+  for (struct msgq *q = qh->head; q; q = qq) {
     qq = q->next;
     free(q->msg);
     free(q);

src/mod/server.mod/servmsg.cc

@@ -264,7 +264,7 @@ void rehash_server(const char *servname, const char *nick)
 void 
 join_chans()
 {
-  for (register struct chanset_t *chan = chanset; chan; chan = chan->next) {
+  for (struct chanset_t *chan = chanset; chan; chan = chan->next) {
     if (shouldjoin(chan))
       force_join_chan(chan, DP_SERVER);
   }
@@ -984,7 +984,7 @@ static void minutely_checks()
     static int count = 4;
     bool ok = 0;
 
-    for (register struct chanset_t *chan = chanset; chan; chan = chan->next) {
+    for (struct chanset_t *chan = chanset; chan; chan = chan->next) {
       if (channel_active(chan) && chan->channel.members == 1) {
         ok = 1;
         break;

src/mod/transfer.mod/transfer.cc

@@ -88,12 +88,12 @@ static void dcc_get_pending(int, char *, int);
  */
 #define	PMAX_SIZE	4096
 static unsigned long pump_file_to_sock(FILE *file, long sock,
-				       register unsigned long pending_data)
+				       unsigned long pending_data)
 {
   const unsigned long		 buf_len = pending_data >= PMAX_SIZE ?
 	  					PMAX_SIZE : pending_data;
   char				*bf = (char *) my_calloc(1, buf_len);
-  register unsigned long	 actual_size;
+  unsigned long	 actual_size;
 
   if (bf) {
     do {
@@ -637,7 +637,7 @@ void display_dcc_fork_send(int idx, char *buf, size_t bufsiz)
 
 void kill_dcc_xfer(int idx, void *x)
 {
-  register struct xfer_info *p = (struct xfer_info *) x;
+  struct xfer_info *p = (struct xfer_info *) x;
 
   if (p->filename)
     free(p->filename);

src/net.cc

@@ -400,7 +400,7 @@ int real_getsock(int options, const char *fname, int line)
 
 /* Done with a socket
  */
-void real_killsock(register int sock, const char *file, int line)
+void real_killsock(int sock, const char *file, int line)
 {
   if (sock < 0) {
     putlog(LOG_ERRORS, "*", "Attempt to kill socket -1 %s:%d", file, line);
@@ -1318,7 +1318,7 @@ int sockgets(char *s, int *len)
  * 
  * NOTE: Do NOT put Contexts in here if you want DEBUG to be meaningful!!
  */
-void tputs(register int z, const char *s, size_t len)
+void tputs(int z, const char *s, size_t len)
 {
   if (z < 0)			/* um... HELLO?!  sanity check please! */
     return;			
@@ -1330,7 +1330,7 @@ void tputs(register int z, const char *s, size_t len)
     return;
   }
 
-  register int x, idx;
+  int x, idx;
 
   int i = -1;
   if ((i = findanysnum(z)) != -1) {
@@ -1433,9 +1433,9 @@ void tputs(register int z, const char *s, size_t len)
 */
 }
 
-int findanysnum(register int sock)
+int findanysnum(int sock)
 {
-  register int i = 0;
+  int i = 0;
 
   if (sock != -1)
     for (i = 0; i < MAXSOCKS; i++)

src/net.h

@@ -120,8 +120,8 @@ int real_getsock(int, const char *, int);
 int sockprotocol(int);
 void real_killsock(int, const char *, int);
 int answer(int, char *, in_addr_t *, in_port_t *, int);
-int findanysnum(register int);
-int findanyidx(register int sock);
+int findanysnum(int);
+int findanyidx(int sock);
 int open_listen(in_port_t *);
 int open_listen_by_af(in_port_t *, int);
 int open_listen_addr_by_af(const char*, in_port_t *, int);

src/userent.cc

@@ -566,7 +566,7 @@ struct user_entry_type USERENTRY_MODIFIED =
 static bool pass_set(struct userrec *u, struct user_entry *e, void *buf)
 {
   char *newpass = NULL;
-  register char *pass = (char *) buf;
+  char *pass = (char *) buf;
 
   if (e->u.extra)
     free(e->u.extra);
@@ -614,7 +614,7 @@ struct user_entry_type USERENTRY_PASS =
 
 static bool pass1_set(struct userrec *u, struct user_entry *e, void *buf)
 {
-  register char *pass = (char *) buf;
+  char *pass = (char *) buf;
 
   if (e->u.extra)
     free(e->u.extra);
@@ -820,14 +820,14 @@ static bool botaddr_kill(struct user_entry *e)
 
 static void botaddr_write_userfile(bd::Stream& stream, const struct userrec *u, const struct user_entry *e, int idx)
 {
-  register struct bot_addr *bi = (struct bot_addr *) e->u.extra;
+  struct bot_addr *bi = (struct bot_addr *) e->u.extra;
 
   stream << bd::String::printf("--%s %s:%u/%u:%u:%s\n", e->type->name, bi->address, bi->telnet_port, bi->relay_port, bi->hublevel, bi->uplink);
 }
 
 static bool botaddr_set(struct userrec *u, struct user_entry *e, void *buf)
 {
-  register struct bot_addr *bi = (struct bot_addr *) e->u.extra;
+  struct bot_addr *bi = (struct bot_addr *) e->u.extra;
 
   if (!bi && !buf)
     return 1;
@@ -856,7 +856,7 @@ static void botaddr_display(int idx, struct user_entry *e, struct userrec *u)
 
     get_user_flagrec(dcc[idx].user, &fr, NULL);
     if (glob_admin(fr)) {
-      register struct bot_addr *bi = (struct bot_addr *) e->u.extra;
+      struct bot_addr *bi = (struct bot_addr *) e->u.extra;
 
       if (bi->hublevel && bi->hublevel != 999) {
         if (bi->address) {