9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/chmode.c: misc cleanups for compiler warnings

Browse source 
chmode.c:417:12: warning: possible misuse of comma operator here
                 [-Wcomma]

    (... and 12 more of the same)
This commit is contained in:
Aaron Jones 2017-07-31 06:00:18 +00:00
parent f54e6c3558
commit f21bac62f4
No known key found for this signature in database
GPG key ID: 8AF0737488AB3012
1 changed files with 47 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/chmode.c
View file

@ -414,29 +414,43 @@ pretty_mask(const char *idmask)
at = t; at = t;
t++; t++;
if(*t != '\0') if(*t != '\0')
host = t, hl = strlen(t); {
host = t;
hl = strlen(t);
}
if((t = memchr(mask, '!', at - mask)) != NULL) if((t = memchr(mask, '!', at - mask)) != NULL)
{ {
ex = t; ex = t;
t++; t++;
if(at != t) if(at != t)
user = t, ul = at - t;
if(ex != mask)
nick = mask, nl = ex - mask;
}
else
{ {
if(at != mask) user = t;
user = mask, ul = at - mask; ul = at - t;
}
if(ex != mask)
{
nick = mask;
nl = ex - mask;
}
}
else if(at != mask)
{
user = mask;
ul = at - mask;
} }
if((t = memchr(host, '!', hl)) != NULL || if((t = memchr(host, '!', hl)) != NULL ||
(t = memchr(host, '$', hl)) != NULL) (t = memchr(host, '$', hl)) != NULL)
{ {
t++; t++;
if (host + hl != t) if (host + hl != t)
forward = t, fl = host + hl - t; {
forward = t;
fl = host + hl - t;
}
hl = t - 1 - host; hl = t - 1 - host;
} }
} }
@ -445,19 +459,26 @@ pretty_mask(const char *idmask)
ex = t; ex = t;
t++; t++;
if(ex != mask) if(ex != mask)
nick = mask, nl = ex - mask; {
nick = mask;
nl = ex - mask;
}
if(*t != '\0') if(*t != '\0')
user = t, ul = strlen(t); {
user = t;
ul = strlen(t);
}
} }
else if(memchr(mask, '.', masklen) != NULL || else if(memchr(mask, '.', masklen) != NULL ||
memchr(mask, ':', masklen) != NULL) memchr(mask, ':', masklen) != NULL)
{ {
host = mask, hl = masklen; host = mask;
hl = masklen;
} }
else else if(masklen > 0)
{ {
if(masklen > 0) nick = mask;
nick = mask, nl = masklen; nl = masklen;
} }
/* truncate values to max lengths */ /* truncate values to max lengths */
@ -470,15 +491,24 @@ pretty_mask(const char *idmask)
if(fl > CHANNELLEN) if(fl > CHANNELLEN)
fl = CHANNELLEN; fl = CHANNELLEN;
memcpy(mask_buf + mask_pos, nick, nl), mask_pos += nl; memcpy(mask_buf + mask_pos, nick, nl);
mask_pos += nl;
mask_buf[mask_pos++] = '!'; mask_buf[mask_pos++] = '!';
memcpy(mask_buf + mask_pos, user, ul), mask_pos += ul;
memcpy(mask_buf + mask_pos, user, ul);
mask_pos += ul;
mask_buf[mask_pos++] = '@'; mask_buf[mask_pos++] = '@';
memcpy(mask_buf + mask_pos, host, hl), mask_pos += hl;
memcpy(mask_buf + mask_pos, host, hl);
mask_pos += hl;
if (forward) { if (forward) {
mask_buf[mask_pos++] = '$'; mask_buf[mask_pos++] = '$';
memcpy(mask_buf + mask_pos, forward, fl), mask_pos += fl;
memcpy(mask_buf + mask_pos, forward, fl);
mask_pos += fl;
} }
mask_buf[mask_pos++] = '\0'; mask_buf[mask_pos++] = '\0';
return mask_buf + old_mask_pos; return mask_buf + old_mask_pos;