[NeoStats-Devel] [Commits] r2783 - in trunk: include modules/hostserv src

Author: Mark
Date: Wed Aug 31 05:06:15 2005
New Revision: 2783

Modified:
   trunk/include/configwin32.h
   trunk/include/neostats.h
   trunk/modules/hostserv/hostserv.c
   trunk/src/commands.c
   trunk/src/ircstring.c
   trunk/src/misc.c
   trunk/src/osfile.c
   trunk/src/settings.c
Log:
portability fixes and win32 tidy ups

Modified: trunk/include/configwin32.h
==============================================================================
--- trunk/include/configwin32.h	(original)
+++ trunk/include/configwin32.h	Wed Aug 31 05:06:15 2005
@@ -524,17 +524,10 @@
 /* #undef HAVE___VA_COPY */
 
 /* Additional Win32 specifics */
-#define strcasecmp stricmp 
-#define strncasecmp strnicmp 
-#define index strchr
-#define rindex strrchr
 #define __PRETTY_FUNCTION__ __FUNCTION__
 #define inline __inline
 #define sleep(n)
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
 #include <io.h>
-#define access _access
 #define getpid GetCurrentProcessId
 #include <direct.h>
 #define S_IWUSR _S_IWRITE

Modified: trunk/include/neostats.h
==============================================================================
--- trunk/include/neostats.h	(original)
+++ trunk/include/neostats.h	Wed Aug 31 05:06:15 2005
@@ -1665,10 +1665,6 @@
 EXPORTFUNC void SetBotModValue( Bot *pBot, void *data );
 EXPORTFUNC void *GetBotModValue( const Bot *pBot );
 
-//#define ClearBotModValue( b ) b->moddata = 0
-//#define SetBotModValue( b, data ) b->moddata = data
-//#define GetBotModValue( b ) b->moddata
-
 /* MQ Server update sending functions */
 typedef enum MQ_MSG_TYPE {
 	UPDATE_SSREPORT=1,

Modified: trunk/modules/hostserv/hostserv.c
==============================================================================
--- trunk/modules/hostserv/hostserv.c	(original)
+++ trunk/modules/hostserv/hostserv.c	Wed Aug 31 05:06:15 2005
@@ -742,7 +742,7 @@
 			return NS_SUCCESS;
 		}
 	}
-	if( ValidateHost( cmdparams->av[2] ) == NS_FAILURE || !index( cmdparams->av[2], '.' ) ) {
+	if( ValidateHost( cmdparams->av[2] ) == NS_FAILURE || !strchr( cmdparams->av[2], '.' ) ) {
 		irc_prefmsg( hs_bot, cmdparams->source, 
 			"%s is an invalid host", cmdparams->av[2] );
 		return NS_SUCCESS;

Modified: trunk/src/commands.c
==============================================================================
--- trunk/src/commands.c	(original)
+++ trunk/src/commands.c	Wed Aug 31 05:06:15 2005
@@ -240,7 +240,7 @@
 	}
 	/* Seems OK, add the command */
 	hnode_create_insert( cmd_hash, cmd_ptr, cmd_ptr->cmd );
-	snprintf( confcmd, 32, "command%s", cmd_ptr->cmd );
+	ircsnprintf( confcmd, 32, "command%s", cmd_ptr->cmd );
 	cmd_ptr->modptr = GET_CUR_MODULE();
 	if( DBAFetchConfigInt( confcmd, &ulevel ) == NS_SUCCESS )
 	{
@@ -889,7 +889,7 @@
 		if( newlevel >= 0 && newlevel <= NS_ULEVEL_ROOT )
 		{
 			cmd_ptr->ulevel = newlevel;
-			snprintf( confcmd, 32, "command%s", cmd_ptr->cmd );
+			ircsnprintf( confcmd, 32, "command%s", cmd_ptr->cmd );
 			DBAStoreConfigInt( confcmd, &newlevel );
 			return NS_SUCCESS;
 		}

Modified: trunk/src/ircstring.c
==============================================================================
--- trunk/src/ircstring.c	(original)
+++ trunk/src/ircstring.c	Wed Aug 31 05:06:15 2005
@@ -118,7 +118,11 @@
 					break;
 				default:
 					/* in the event of an unknown type call lib version of vs[n]printf */
+#ifdef WIN32
+					return _vsnprintf( buf, size, fmt, saveargs );
+#else /* WIN32 */
 					return vsnprintf( buf, size, fmt, saveargs );
+#endif /* WIN32 */
 					/* avoid compiler warning by having a superfluous break */
 					break;
 			}

Modified: trunk/src/misc.c
==============================================================================
--- trunk/src/misc.c	(original)
+++ trunk/src/misc.c	Wed Aug 31 05:06:15 2005
@@ -539,7 +539,7 @@
 	static char localuserhost[USERHOSTLEN];
 	char *nick, *user , *host;
 
-	if( !index( userhost, '!' ) || !index( userhost, '@' ) )
+	if( !strchr( userhost, '!' ) || !strchr( userhost, '@' ) )
 		return NS_FAILURE;
 
 	strlcpy( localuserhost, userhost, USERHOSTLEN );
@@ -571,7 +571,7 @@
 	static char localuserhost[USERHOSTLEN];
 	char *nick, *user , *host;
 
-	if( !index( userhost, '!' ) || !index( userhost, '@' ) )
+	if( !strchr( userhost, '!' ) || !strchr( userhost, '@' ) )
 		return NS_FAILURE;
 
 	strlcpy( localuserhost, userhost, USERHOSTLEN );

Modified: trunk/src/osfile.c
==============================================================================
--- trunk/src/osfile.c	(original)
+++ trunk/src/osfile.c	Wed Aug 31 05:06:15 2005
@@ -259,7 +259,11 @@
 {
 	int retval;
 
+#ifdef WIN32
+	retval = _access( path, mode );
+#else /* WIN32 */
 	retval = access( path, mode );
+#endif /* WIN32 */
 	os_file_errno = errno;
 	return retval;
 }

Modified: trunk/src/settings.c
==============================================================================
--- trunk/src/settings.c	(original)
+++ trunk/src/settings.c	Wed Aug 31 05:06:15 2005
@@ -373,7 +373,7 @@
 
 static int bot_cmd_set_host( CmdParams *cmdparams, bot_setting *set_ptr )
 {
-	if( !index( cmdparams->av[1], '.' ) ) {
+	if( !strchr( cmdparams->av[1], '.' ) ) {
 		irc_prefmsg( cmdparams->bot, cmdparams->source, 
 			__( "%s is an invalid hostname", cmdparams->source ), cmdparams->av[1] );
 		return NS_ERR_SYNTAX_ERROR;