From 27c96632f1771c061d225b88c34344bb2cf1a743 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 6 Oct 2006 19:57:56 +0000 Subject: [PATCH] Client_IsValidNick: no need to strcpy. --- src/ngircd/client.c | 17 +++++++---------- src/ngircd/client.h | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 01ef0916..ec3c6ce7 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -17,7 +17,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: client.c,v 1.91 2006/04/23 10:37:27 fw Exp $"; +static char UNUSED id[] = "$Id: client.c,v 1.92 2006/10/06 19:57:56 fw Exp $"; #include "imp.h" #include @@ -979,16 +979,13 @@ Client_MyMaxUserCount( void ) GLOBAL bool -Client_IsValidNick( char *Nick ) +Client_IsValidNick( const char *Nick ) { - /* Ist der Nick gueltig? */ + const char *ptr; + static const char goodchars[] = ";0123456789-"; - char *ptr, goodchars[20]; - assert( Nick != NULL ); - strcpy( goodchars, ";0123456789-" ); - if( Nick[0] == '#' ) return false; if( strchr( goodchars, Nick[0] )) return false; if( strlen( Nick ) >= CLIENT_NICK_LEN ) return false; @@ -996,11 +993,11 @@ Client_IsValidNick( char *Nick ) ptr = Nick; while( *ptr ) { - if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false; - if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return false; + if (( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false; + if ( *ptr > '}' ) return false; ptr++; } - + return true; } /* Client_IsValidNick */ diff --git a/src/ngircd/client.h b/src/ngircd/client.h index a7f81664..b48f804f 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: client.h,v 1.43 2006/10/01 19:05:02 alex Exp $ + * $Id: client.h,v 1.44 2006/10/06 19:57:56 fw Exp $ * * Client management (header) */ @@ -145,7 +145,7 @@ GLOBAL long Client_MyServerCount PARAMS(( void )); GLOBAL long Client_MaxUserCount PARAMS(( void )); GLOBAL long Client_MyMaxUserCount PARAMS(( void )); -GLOBAL bool Client_IsValidNick PARAMS(( char *Nick )); +GLOBAL bool Client_IsValidNick PARAMS(( const char *Nick )); GLOBAL WHOWAS *Client_GetWhowas PARAMS(( void )); GLOBAL int Client_GetLastWhowasIndex PARAMS(( void ));