Whitespace fixes (no functional changes)

This commit is contained in:
Alexander Barton 2015-08-01 15:15:30 +02:00
parent 0083fe177f
commit 9811223fb8
12 changed files with 72 additions and 74 deletions

View File

@ -352,16 +352,16 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
!Channel_UserHasMode(chan, Target, 'q') && !Channel_UserHasMode(chan, Target, 'q') &&
!Channel_UserHasMode(chan, Target, 'a')) !Channel_UserHasMode(chan, Target, 'a'))
can_kick = true; can_kick = true;
/* Half Op can't kick owner | admin | op */ /* Half Op can't kick owner | admin | op */
else if (Channel_UserHasMode(chan, Peer, 'h') && else if (Channel_UserHasMode(chan, Peer, 'h') &&
!Channel_UserHasMode(chan, Target, 'q') && !Channel_UserHasMode(chan, Target, 'q') &&
!Channel_UserHasMode(chan, Target, 'a') && !Channel_UserHasMode(chan, Target, 'a') &&
!Channel_UserHasMode(chan, Target, 'o')) !Channel_UserHasMode(chan, Target, 'o'))
can_kick = true; can_kick = true;
/* IRC operators & IRCd with OperCanMode enabled /* IRC operators & IRCd with OperCanMode enabled
* can kick anyways regardless of privilege */ * can kick anyways regardless of privilege */
else if(Client_HasMode(Origin, 'o') && Conf_OperCanMode) else if(Client_HasMode(Origin, 'o') && Conf_OperCanMode)
can_kick = true; can_kick = true;
@ -1044,7 +1044,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
switch( Type ) switch( Type )
{ {
case REMOVE_QUIT: case REMOVE_QUIT:
/* QUIT: other servers have already been notified, /* QUIT: other servers have already been notified,
* see Client_Destroy(); so only inform other clients * see Client_Destroy(); so only inform other clients
* in same channel. */ * in same channel. */
assert( InformServer == false ); assert( InformServer == false );

View File

@ -72,7 +72,7 @@ GLOBAL void
Client_Init( void ) Client_Init( void )
{ {
struct hostent *h; struct hostent *h;
This_Server = New_Client_Struct( ); This_Server = New_Client_Struct( );
if( ! This_Server ) if( ! This_Server )
{ {
@ -98,7 +98,7 @@ Client_Init( void )
Client_SetInfo( This_Server, Conf_ServerInfo ); Client_SetInfo( This_Server, Conf_ServerInfo );
My_Clients = This_Server; My_Clients = This_Server;
memset( &My_Whowas, 0, sizeof( My_Whowas )); memset( &My_Whowas, 0, sizeof( My_Whowas ));
} /* Client_Init */ } /* Client_Init */
@ -111,7 +111,7 @@ Client_Exit( void )
if( NGIRCd_SignalRestart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, false ); if( NGIRCd_SignalRestart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, false );
else Client_Destroy( This_Server, "Server going down.", NULL, false ); else Client_Destroy( This_Server, "Server going down.", NULL, false );
cnt = 0; cnt = 0;
c = My_Clients; c = My_Clients;
while(c) { while(c) {
@ -228,7 +228,7 @@ GLOBAL void
Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool SendQuit ) Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool SendQuit )
{ {
/* remove a client */ /* remove a client */
CLIENT *last, *c; CLIENT *last, *c;
char msg[COMMAND_LEN]; char msg[COMMAND_LEN];
const char *txt; const char *txt;
@ -381,7 +381,7 @@ Client_SetID( CLIENT *Client, const char *ID )
{ {
assert( Client != NULL ); assert( Client != NULL );
assert( ID != NULL ); assert( ID != NULL );
strlcpy( Client->id, ID, sizeof( Client->id )); strlcpy( Client->id, ID, sizeof( Client->id ));
if (Conf_CloakUserToNick) { if (Conf_CloakUserToNick) {
@ -698,7 +698,7 @@ Client_ID( CLIENT *Client )
if(Client->type == CLIENT_USER) if(Client->type == CLIENT_USER)
assert(strlen(Client->id) < Conf_MaxNickLength); assert(strlen(Client->id) < Conf_MaxNickLength);
#endif #endif
if( Client->id[0] ) return Client->id; if( Client->id[0] ) return Client->id;
else return "*"; else return "*";
} /* Client_ID */ } /* Client_ID */

View File

@ -364,7 +364,7 @@ Conf_Test( void )
? (const char*) array_start(&Conf_Motd) : ""); ? (const char*) array_start(&Conf_Motd) : "");
} }
printf(" Network = %s\n", Conf_Network); printf(" Network = %s\n", Conf_Network);
if (!Conf_PAM) if (!Conf_PAM)
printf(" Password = %s\n", Conf_ServerPwd); printf(" Password = %s\n", Conf_ServerPwd);
printf(" PidFile = %s\n", Conf_PidFile); printf(" PidFile = %s\n", Conf_PidFile);
printf(" Ports = "); printf(" Ports = ");

View File

@ -138,7 +138,7 @@ GLOBAL CONN_ID
Conn_First( void ) Conn_First( void )
{ {
CONN_ID i; CONN_ID i;
for( i = 0; i < Pool_Size; i++ ) for( i = 0; i < Pool_Size; i++ )
{ {
if( My_Connections[i].sock != NONE ) return i; if( My_Connections[i].sock != NONE ) return i;
@ -152,7 +152,7 @@ Conn_Next( CONN_ID Idx )
CONN_ID i = NONE; CONN_ID i = NONE;
assert( Idx > NONE ); assert( Idx > NONE );
for( i = Idx + 1; i < Pool_Size; i++ ) for( i = Idx + 1; i < Pool_Size; i++ )
{ {
if( My_Connections[i].sock != NONE ) return i; if( My_Connections[i].sock != NONE ) return i;

View File

@ -745,7 +745,7 @@ ConnSSL_InitCertFp( CONNECTION *c )
gnutls_x509_crt_deinit(cert); gnutls_x509_crt_deinit(cert);
return 0; return 0;
} }
if (gnutls_x509_crt_import(cert, &cert_list[0], if (gnutls_x509_crt_import(cert, &cert_list[0],
GNUTLS_X509_FMT_DER) != GNUTLS_E_SUCCESS) { GNUTLS_X509_FMT_DER) != GNUTLS_E_SUCCESS) {
gnutls_x509_crt_deinit(cert); gnutls_x509_crt_deinit(cert);
@ -912,5 +912,3 @@ ConnSSL_InitLibrary(void)
#endif /* SSL_SUPPORT */ #endif /* SSL_SUPPORT */
/* -eof- */ /* -eof- */

View File

@ -175,7 +175,7 @@ Zip_Flush( CONN_ID Idx )
} }
My_Connections[Idx].bytes_out += zipbuf_used; My_Connections[Idx].bytes_out += zipbuf_used;
My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf); My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf);
array_trunc(&My_Connections[Idx].zip.wbuf); array_trunc(&My_Connections[Idx].zip.wbuf);
return true; return true;
@ -198,7 +198,7 @@ Unzip_Buffer( CONN_ID Idx )
int unzipbuf_used = 0; int unzipbuf_used = 0;
unsigned int z_rdatalen; unsigned int z_rdatalen;
unsigned int in_len; unsigned int in_len;
z_stream *in; z_stream *in;
assert( Idx > NONE ); assert( Idx > NONE );

View File

@ -328,7 +328,7 @@ Conn_Init( void )
array_bytes(&My_ConnArray)); array_bytes(&My_ConnArray));
assert(array_length(&My_ConnArray, sizeof(CONNECTION)) >= (size_t)Pool_Size); assert(array_length(&My_ConnArray, sizeof(CONNECTION)) >= (size_t)Pool_Size);
array_free( &My_Listeners ); array_free( &My_Listeners );
for (i = 0; i < Pool_Size; i++) for (i = 0; i < Pool_Size; i++)
@ -796,7 +796,7 @@ Conn_Handler(void)
GLOBAL bool GLOBAL bool
Conn_WriteStr(CONN_ID Idx, const char *Format, ...) Conn_WriteStr(CONN_ID Idx, const char *Format, ...)
#else #else
GLOBAL bool GLOBAL bool
Conn_WriteStr(Idx, Format, va_alist) Conn_WriteStr(Idx, Format, va_alist)
CONN_ID Idx; CONN_ID Idx;
const char *Format; const char *Format;
@ -829,7 +829,7 @@ va_dcl
* IRC_WriteXXX() functions when the prefix of this server had * IRC_WriteXXX() functions when the prefix of this server had
* to be added to an already "quite long" command line which * to be added to an already "quite long" command line which
* has been received from a regular IRC client, for example. * has been received from a regular IRC client, for example.
* *
* We are not allowed to send such "oversized" messages to * We are not allowed to send such "oversized" messages to
* other servers and clients, see RFC 2812 2.3 and 2813 3.3 * other servers and clients, see RFC 2812 2.3 and 2813 3.3
* ("these messages SHALL NOT exceed 512 characters in length, * ("these messages SHALL NOT exceed 512 characters in length,
@ -2364,7 +2364,7 @@ Simple_Message(int Sock, const char *Msg)
* @returns Pointer to CLIENT structure. * @returns Pointer to CLIENT structure.
*/ */
GLOBAL CLIENT * GLOBAL CLIENT *
Conn_GetClient( CONN_ID Idx ) Conn_GetClient( CONN_ID Idx )
{ {
CONNECTION *c; CONNECTION *c;

View File

@ -92,7 +92,7 @@ Login_User(CLIENT * Client)
/* Don't do any PAM authentication at all if PAM is not /* Don't do any PAM authentication at all if PAM is not
* enabled, instead emulate the behavior of the daemon * enabled, instead emulate the behavior of the daemon
* compiled without PAM support. */ * compiled without PAM support. */
if (strcmp(Conn_Password(conn), Conf_ServerPwd) == 0) if (strcmp(Conn_Password(conn), Conf_ServerPwd) == 0)
return Login_User_PostAuth(Client); return Login_User_PostAuth(Client);
Client_Reject(Client, "Bad server password", false); Client_Reject(Client, "Bad server password", false);
return DISCONNECTED; return DISCONNECTED;

View File

@ -530,7 +530,7 @@ Pidfile_Create(pid_t pid)
close(pidfd); close(pidfd);
return; return;
} }
if (write(pidfd, pidbuf, (size_t)len) != (ssize_t)len) if (write(pidfd, pidbuf, (size_t)len) != (ssize_t)len)
Log(LOG_ERR, "Can't write PID file (%s): %s!", Conf_PidFile, Log(LOG_ERR, "Can't write PID file (%s): %s!", Conf_PidFile,
strerror(errno)); strerror(errno));
@ -721,7 +721,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
Log(LOG_ERR, "Can't change group ID to %s(%u): %s!", Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
grp ? grp->gr_name : "?", Conf_GID, grp ? grp->gr_name : "?", Conf_GID,
strerror(real_errno)); strerror(real_errno));
if (real_errno != EPERM) if (real_errno != EPERM)
goto out; goto out;
} }
#ifdef HAVE_SETGROUPS #ifdef HAVE_SETGROUPS

View File

@ -156,7 +156,7 @@ Parse_GetCommandStruct( void )
/** /**
* Parse a command ("request") received from a client. * Parse a command ("request") received from a client.
* *
* This function is called after the connection layer received a valid CR+LF * This function is called after the connection layer received a valid CR+LF
* terminated line of text: we assume that this is a valid IRC command and * terminated line of text: we assume that this is a valid IRC command and
* try to do something useful with it :-) * try to do something useful with it :-)

View File

@ -196,7 +196,7 @@ main(void)
Check_strlcat(); Check_strlcat();
Check_strtok_r(); Check_strtok_r();
Check_vsnprintf(2+10, "%s%s", "ab", "1234567890"); Check_vsnprintf(2+10, "%s%s", "ab", "1234567890");
return 0; return 0;
} }

View File

@ -50,9 +50,9 @@
* original. Also, there is now a builtin-test, just compile with: * original. Also, there is now a builtin-test, just compile with:
* gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
* and run snprintf for results. * and run snprintf for results.
* *
* Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i * Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
* The PGP code was using unsigned hexadecimal formats. * The PGP code was using unsigned hexadecimal formats.
* Unfortunately, unsigned formats simply didn't work. * Unfortunately, unsigned formats simply didn't work.
* *
* Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8 * Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
@ -165,21 +165,21 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
int flags; int flags;
int cflags; int cflags;
size_t currlen; size_t currlen;
state = DP_S_DEFAULT; state = DP_S_DEFAULT;
currlen = flags = cflags = min = 0; currlen = flags = cflags = min = 0;
max = -1; max = -1;
ch = *format++; ch = *format++;
while (state != DP_S_DONE) { while (state != DP_S_DONE) {
if (ch == '\0') if (ch == '\0')
state = DP_S_DONE; state = DP_S_DONE;
switch(state) { switch(state) {
case DP_S_DEFAULT: case DP_S_DEFAULT:
if (ch == '%') if (ch == '%')
state = DP_S_FLAGS; state = DP_S_FLAGS;
else else
dopr_outch (buffer, &currlen, maxlen, ch); dopr_outch (buffer, &currlen, maxlen, ch);
ch = *format++; ch = *format++;
break; break;
@ -226,7 +226,7 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
if (ch == '.') { if (ch == '.') {
state = DP_S_MAX; state = DP_S_MAX;
ch = *format++; ch = *format++;
} else { } else {
state = DP_S_MOD; state = DP_S_MOD;
} }
break; break;
@ -271,7 +271,7 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
switch (ch) { switch (ch) {
case 'd': case 'd':
case 'i': case 'i':
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg (args, int); value = va_arg (args, int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg (args, long int); value = va_arg (args, long int);
@ -401,12 +401,12 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
} }
} }
if (maxlen != 0) { if (maxlen != 0) {
if (currlen < maxlen - 1) if (currlen < maxlen - 1)
buffer[currlen] = '\0'; buffer[currlen] = '\0';
else if (maxlen > 0) else if (maxlen > 0)
buffer[maxlen - 1] = '\0'; buffer[maxlen - 1] = '\0';
} }
return currlen; return currlen;
} }
@ -426,11 +426,11 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen, char *value, int flags,
for (strln = 0; value[strln]; ++strln); /* strlen */ for (strln = 0; value[strln]; ++strln); /* strlen */
padlen = min - strln; padlen = min - strln;
if (padlen < 0) if (padlen < 0)
padlen = 0; padlen = 0;
if (flags & DP_F_MINUS) if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justify */ padlen = -padlen; /* Left Justify */
while ((padlen > 0) && (cnt < max)) { while ((padlen > 0) && (cnt < max)) {
dopr_outch (buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
--padlen; --padlen;
@ -460,12 +460,12 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base,
int spadlen = 0; /* amount to space pad */ int spadlen = 0; /* amount to space pad */
int zpadlen = 0; /* amount to zero pad */ int zpadlen = 0; /* amount to zero pad */
int caps = 0; int caps = 0;
if (max < 0) if (max < 0)
max = 0; max = 0;
uvalue = value; uvalue = value;
if(!(flags & DP_F_UNSIGNED)) { if(!(flags & DP_F_UNSIGNED)) {
if( value < 0 ) { if( value < 0 ) {
signvalue = '-'; signvalue = '-';
@ -477,7 +477,7 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base,
signvalue = ' '; signvalue = ' ';
} }
} }
if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
do { do {
@ -497,7 +497,7 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base,
zpadlen = MAX(zpadlen, spadlen); zpadlen = MAX(zpadlen, spadlen);
spadlen = 0; spadlen = 0;
} }
if (flags & DP_F_MINUS) if (flags & DP_F_MINUS)
spadlen = -spadlen; /* Left Justifty */ spadlen = -spadlen; /* Left Justifty */
#ifdef DEBUG_SNPRINTF #ifdef DEBUG_SNPRINTF
@ -512,7 +512,7 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base,
} }
/* Sign */ /* Sign */
if (signvalue) if (signvalue)
dopr_outch (buffer, currlen, maxlen, signvalue); dopr_outch (buffer, currlen, maxlen, signvalue);
/* Zeros */ /* Zeros */
@ -524,9 +524,9 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base,
} }
/* Digits */ /* Digits */
while (place > 0) while (place > 0)
dopr_outch (buffer, currlen, maxlen, convert[--place]); dopr_outch (buffer, currlen, maxlen, convert[--place]);
/* Left Justified spaces */ /* Left Justified spaces */
while (spadlen < 0) { while (spadlen < 0) {
dopr_outch (buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
@ -541,7 +541,7 @@ abs_val(LDOUBLE value)
if (value < 0) if (value < 0)
result = -value; result = -value;
return result; return result;
} }
@ -549,12 +549,12 @@ static LDOUBLE
POW10(int exp) POW10(int exp)
{ {
LDOUBLE result = 1; LDOUBLE result = 1;
while (exp) { while (exp) {
result *= 10; result *= 10;
exp--; exp--;
} }
return result; return result;
} }
@ -566,7 +566,7 @@ ROUND(LDOUBLE value)
intpart = (LLONG)value; intpart = (LLONG)value;
value = value - intpart; value = value - intpart;
if (value >= 0.5) intpart++; if (value >= 0.5) intpart++;
return intpart; return intpart;
} }
@ -600,7 +600,7 @@ my_modf(double x0, double *iptr)
ret = my_modf(x0-l*f, &i2); ret = my_modf(x0-l*f, &i2);
(*iptr) = l*f + i2; (*iptr) = l*f + i2;
return ret; return ret;
} }
(*iptr) = l; (*iptr) = l;
return x - (*iptr); return x - (*iptr);
@ -618,14 +618,14 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue,
int iplace = 0; int iplace = 0;
int fplace = 0; int fplace = 0;
int padlen = 0; /* amount to pad */ int padlen = 0; /* amount to pad */
int zpadlen = 0; int zpadlen = 0;
int caps = 0; int caps = 0;
int index; int index;
double intpart; double intpart;
double fracpart; double fracpart;
double temp; double temp;
/* /*
* AIX manpage says the default is 0, but Solaris says the default * AIX manpage says the default is 0, but Solaris says the default
* is 6, and sprintf on AIX defaults to 6 * is 6, and sprintf on AIX defaults to 6
*/ */
@ -645,8 +645,8 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue,
} }
} }
/* /*
* Sorry, we only support 16 digits past the decimal because of our * Sorry, we only support 16 digits past the decimal because of our
* conversion method * conversion method
*/ */
if (max > 16) if (max > 16)
@ -660,7 +660,7 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue,
my_modf(temp, &intpart); my_modf(temp, &intpart);
fracpart = ROUND((POW10(max)) * (ufvalue - intpart)); fracpart = ROUND((POW10(max)) * (ufvalue - intpart));
if (fracpart >= POW10(max)) { if (fracpart >= POW10(max)) {
intpart++; intpart++;
fracpart -= POW10(max); fracpart -= POW10(max);
@ -697,16 +697,16 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue,
if (fplace == 311) fplace--; if (fplace == 311) fplace--;
} }
fconvert[fplace] = 0; fconvert[fplace] = 0;
/* -1 for decimal point, another -1 if we are printing a sign */ /* -1 for decimal point, another -1 if we are printing a sign */
padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
zpadlen = max - fplace; zpadlen = max - fplace;
if (zpadlen < 0) zpadlen = 0; if (zpadlen < 0) zpadlen = 0;
if (padlen < 0) if (padlen < 0)
padlen = 0; padlen = 0;
if (flags & DP_F_MINUS) if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justifty */ padlen = -padlen; /* Left Justifty */
if ((flags & DP_F_ZERO) && (padlen > 0)) { if ((flags & DP_F_ZERO) && (padlen > 0)) {
if (signvalue) { if (signvalue) {
dopr_outch (buffer, currlen, maxlen, signvalue); dopr_outch (buffer, currlen, maxlen, signvalue);
@ -722,10 +722,10 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue,
dopr_outch (buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
--padlen; --padlen;
} }
if (signvalue) if (signvalue)
dopr_outch (buffer, currlen, maxlen, signvalue); dopr_outch (buffer, currlen, maxlen, signvalue);
while (iplace > 0) while (iplace > 0)
dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]); dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
#ifdef DEBUG_SNPRINTF #ifdef DEBUG_SNPRINTF
@ -738,11 +738,11 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue,
*/ */
if (max > 0) { if (max > 0) {
dopr_outch (buffer, currlen, maxlen, '.'); dopr_outch (buffer, currlen, maxlen, '.');
while (fplace > 0) while (fplace > 0)
dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]); dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
} }
while (zpadlen > 0) { while (zpadlen > 0) {
dopr_outch (buffer, currlen, maxlen, '0'); dopr_outch (buffer, currlen, maxlen, '0');
--zpadlen; --zpadlen;
@ -786,7 +786,7 @@ va_dcl
{ {
size_t ret; size_t ret;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
ret = vsnprintf(str, count, fmt, ap); ret = vsnprintf(str, count, fmt, ap);
va_end(ap); va_end(ap);