[NeoStats-Devel] [Commits] rev 2360 - in trunk: . include modules/extauth modules/hostserv modules/statserv src src/dbm

Author: Mark
Date: Fri Mar 18 03:51:29 2005
New Revision: 2360

Modified:
   trunk/ChangeLog
   trunk/include/neostats.h
   trunk/modules/extauth/extauth.c
   trunk/modules/hostserv/hostserv.c
   trunk/modules/statserv/channel.c
   trunk/modules/statserv/server.c
   trunk/modules/statserv/tld.c
   trunk/src/dbm/gdbm.c
   trunk/src/exclude.c
Log:
DBA layer will now pass size of data fetched in FetchRows

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Fri Mar 18 03:51:29 2005
@@ -4,6 +4,7 @@
 Fish (F), Mark (M), DeadNotBuried (D)
 ===============================================================================
 * NeoStats * Version 3.0.a3-dev
+ - DBA layer will now pass size of data fetched in FetchRows. (M)
  - Add support to ircd layer for processing ERROR messages from the uplink. (M)
  - Add optional SERVICE_HOST config entry to allow users to set a default host
    for service bots. If not specified, server name is used. (M)

Modified: trunk/include/neostats.h
==============================================================================
--- trunk/include/neostats.h	(original)
+++ trunk/include/neostats.h	Fri Mar 18 03:51:29 2005
@@ -1229,7 +1229,7 @@
 
 #define CONFIG_TABLE_NAME	"config"
 
-typedef int (*DBRowHandler) ( void *data );
+typedef int (*DBRowHandler) ( void *data, int size );
 
 /* DB API */
 EXPORTFUNC int DBAOpenDatabase( void );

Modified: trunk/modules/extauth/extauth.c
==============================================================================
--- trunk/modules/extauth/extauth.c	(original)
+++ trunk/modules/extauth/extauth.c	Fri Mar 18 03:51:29 2005
@@ -96,7 +96,7 @@
  *  @return none
  */
 
-static int dbaccesslisthandler (void *data)
+static int dbaccesslisthandler( void *data, int size )
 {
 	AccessEntry *access;
 	

Modified: trunk/modules/hostserv/hostserv.c
==============================================================================
--- trunk/modules/hostserv/hostserv.c	(original)
+++ trunk/modules/hostserv/hostserv.c	Fri Mar 18 03:51:29 2005
@@ -204,7 +204,7 @@
 	return NS_SUCCESS;
 }
 
-int new_dbvhost( void *data )
+int new_dbvhost( void *data, int size )
 {
 	vhostentry *vhe;
 
@@ -268,7 +268,7 @@
  *  @return none
  */
 
-static int new_ban( void *data )
+static int new_ban( void *data, int size )
 {
 	banentry *ban;
 

Modified: trunk/modules/statserv/channel.c
==============================================================================
--- trunk/modules/statserv/channel.c	(original)
+++ trunk/modules/statserv/channel.c	Fri Mar 18 03:51:29 2005
@@ -375,7 +375,7 @@
  * @returns nothing
  */
 
-static int del_chan( void *data )
+static int del_chan( void *data, int size )
 {
 	channelstat *cs;
 	

Modified: trunk/modules/statserv/server.c
==============================================================================
--- trunk/modules/statserv/server.c	(original)
+++ trunk/modules/statserv/server.c	Fri Mar 18 03:51:29 2005
@@ -329,7 +329,6 @@
 
 static int ss_cmd_server_stats (CmdParams *cmdparams)
 {
-	time_t uptime;
 	serverstat *ss;
 	Client *s;
 	char *server;
@@ -352,7 +351,9 @@
 			sftime(ss->ts_lastseen));
 	} else {
 		/* Calculate uptime as uptime from server plus uptime of NeoStats */
-		time_t uptime = s->server->uptime  + (me.now - me.ts_boot);
+		time_t uptime;
+
+		uptime = s->server->uptime + (me.now - me.ts_boot);
 		irc_prefmsg (ss_bot, cmdparams->source, "Version: %s", s->version );
 		irc_prefmsg (ss_bot, cmdparams->source, "Uptime:  %ld day%s, %02ld:%02ld:%02ld", (uptime / 86400), (uptime / 86400 == 1) ? "" : "s", ((uptime / 3600) % 24), ((uptime / 60) % 60), (uptime % 60) );
 		irc_prefmsg (ss_bot, cmdparams->source, "Current Users: %-3d (%d%%)", 
@@ -427,7 +428,7 @@
 	}
 }
 
-int LoadServerStats(void *data) 
+int LoadServerStats(void *data, int size) 
 {
 	serverstat *ss;
 

Modified: trunk/modules/statserv/tld.c
==============================================================================
--- trunk/modules/statserv/tld.c	(original)
+++ trunk/modules/statserv/tld.c	Fri Mar 18 03:51:29 2005
@@ -188,7 +188,7 @@
 	}
 }
 
-int new_tld (void *data)
+int new_tld( void *data, int size )
 {
 	TLD *t;
 

Modified: trunk/src/dbm/gdbm.c
==============================================================================
--- trunk/src/dbm/gdbm.c	(original)
+++ trunk/src/dbm/gdbm.c	Fri Mar 18 03:51:29 2005
@@ -109,7 +109,7 @@
 		dlog( DEBUG4, "DBMGetTableRows: key %s", dbkey.dptr );
 		dbdata = gdbm_fetch( ( gdbm_file_info * )handle, dbkey );
 		/* Allow handler to exit the fetch loop */
-		if( handler( dbdata.dptr ) != NS_FALSE  )
+		if( handler( dbdata.dptr, dbdata.dsize ) != NS_FALSE  )
 		{
 			free( dbdata.dptr );
 			free( dbkey.dptr );

Modified: trunk/src/exclude.c
==============================================================================
--- trunk/src/exclude.c	(original)
+++ trunk/src/exclude.c	Fri Mar 18 03:51:29 2005
@@ -67,13 +67,13 @@
 	dlog(DEBUG2, "Added exclusion %s (%d) by %s on %d", e->pattern, e->type, e->addedby, (int)e->addedon);
 }
 
-static int new_global_exclude(void *data)
+static int new_global_exclude( void *data, int size )
 {
 	new_exclude(exclude_list, data);
 	return NS_FALSE;
 }
 
-static int new_mod_exclude(void *data)
+static int new_mod_exclude( void *data, int size)
 {
 	new_exclude(excludelists[GET_CUR_MODNUM()], data);
 	return NS_FALSE;