fixed various build errors

diff --git a/src/proto-common.c b/src/proto-common.c
index 324058f28998a5cc23811f1294cb418dbffc3cb9..89f4ebd0fca34aef9c68f557cb30e5ce0c4956a0 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -758,7 +758,7 @@ generate_hostmask(struct userNode *user, int options)
     }
     hostname = user->hostname;
     if (IsFakeHost(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) {
-        if(user->fakehost && user->fakehost[0] == "$") {
+        if(user->fakehost && user->fakehost[0] == '$') {
             hostname = alloca(strlen(user->handle_info->handle) + strlen(user->fakehost));
             sprintf(hostname, "%s%s", user->handle_info->handle, user->fakehost+1);
         } else {

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 16de1cbf9eb9cc2d38d083a3d394514205107c80..11dfb267fc22a6ec5de2feb2cca6f9bc246a39b6 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -2548,12 +2548,12 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
         case 'z':
           if (!(flags & MCP_REGISTERED) && (!(flags & MCP_IGN_REGISTERED) || add)) {
             do_chan_mode(MODE_REGISTERED);
-+          } else if (flags & MCP_IGN_REGISTERED) {
-+           /* ignore the modechange but continue parsing */
-           } else {
+          } else if (flags & MCP_IGN_REGISTERED) {
+            /* ignore the modechange but continue parsing */
+          } else {
             mod_chanmode_free(change);
             return NULL;
-           }
+          }
           break;
 #undef do_chan_mode
         case 'l':
@@ -2932,7 +2932,7 @@ mod_chanmode_format(struct mod_chanmode *change, char *outbuff)
         DO_MODE_CHAR(REGISTERED, 'z');
         DO_MODE_CHAR(LIMIT, 'l'), args_used += sprintf(args + args_used, " %d", change->new_limit);
         DO_MODE_CHAR(KEY, 'k'), args_used += sprintf(args + args_used, " %s", change->new_key);
-        DO_MODE_CHAR(KEY, 'a'), args_used += sprintf(args + args_used, " %s", change->new_access);
+        DO_MODE_CHAR(KEY, 'a'), args_used += sprintf(args + args_used, " %d", change->new_access);
         DO_MODE_CHAR(KEY, 'F'), args_used += sprintf(args + args_used, " %s", change->new_altchan);
         DO_MODE_CHAR(UPASS, 'U'), args_used += sprintf(args + args_used, " %s", change->new_upass);
         DO_MODE_CHAR(APASS, 'A'), args_used += sprintf(args + args_used, " %s", change->new_apass);