hgengine-cvs

[Hgengine-cvs] SF.net SVN: hgengine:[229] Mercury2/src/MercuryString.cpp

[<cn...@us...>]

Revision: 229
          http://hgengine.svn.sourceforge.net/hgengine/?rev=229&view=rev
Author:   cnlohr
Date:     2009-05-12 04:59:03 +0000 (Tue, 12 May 2009)

Log Message:
-----------
warnings galore: fixed.

Modified Paths:
--------------
    Mercury2/src/MercuryString.cpp

Modified: Mercury2/src/MercuryString.cpp
===================================================================
--- Mercury2/src/MercuryString.cpp	2009-05-12 04:58:42 UTC (rev 228)
+++ Mercury2/src/MercuryString.cpp	2009-05-12 04:59:03 UTC (rev 229)
@@ -44,7 +44,7 @@
 
 MString::MString( const char * sIn )
 {
-	m_iLen = strlen( sIn );
+	m_iLen = (unsigned long)strlen( sIn );
 	m_iAlloc = m_iLen + 1;
 	m_sCur = (char*)malloc( m_iAlloc );
 	memcpy( m_sCur, sIn, m_iAlloc );
@@ -92,7 +92,7 @@
 	if (rhs != m_sCur)
 	{
 		free (m_sCur);
-		m_iLen = strlen( rhs );
+		m_iLen = (unsigned long)strlen( rhs );
 		m_iAlloc = m_iLen + 1;
 		m_sCur = (char*)malloc( m_iAlloc );
 		memcpy( m_sCur, rhs, m_iAlloc );
@@ -115,7 +115,7 @@
 {
 	if ( !rhs )
 		return (*this);
-	int iRhsLen = strlen( rhs );
+	int iRhsLen = (int)strlen( rhs );
 	int iNextMalloc = NEXT_ALLOC( m_iLen, iRhsLen );
 	MString ret( iNextMalloc );
 	ret.m_iLen = m_iLen + iRhsLen;
@@ -138,7 +138,7 @@
 
 const MString & MString::operator += ( const char * rhs )
 {
-	int iRhsLen = strlen( rhs );
+	int iRhsLen = (int)strlen( rhs );
 	MANAGE_ALLOC( iRhsLen )
 	memcpy( m_sCur + m_iLen, rhs, iRhsLen );
 	m_iLen += iRhsLen;
@@ -202,7 +202,7 @@
 
 void MString::append( const char * app )
 {
-	int iRhsLen = strlen( app );
+	int iRhsLen = (int)strlen( app );
 	MANAGE_ALLOC( iRhsLen )
 	memcpy( m_sCur + m_iLen, app, iRhsLen );
 	m_iLen += iRhsLen;
@@ -238,7 +238,7 @@
 void MString::assign( const char * app )
 {
 	free( m_sCur );
-	m_iLen = strlen( app );
+	m_iLen = (unsigned long)strlen( app );
 	m_iAlloc = m_iLen + 1;
 	m_sCur = (char*)malloc( m_iAlloc );
 	memcpy( m_sCur, app, m_iAlloc );
@@ -282,7 +282,7 @@
 
 int MString::rfind( const char * tofind ) const
 {
-	int iLen = strlen( tofind );
+	int iLen = (int)strlen( tofind );
 	int iTarg = m_iLen - iLen;
 
 	while ( iTarg >= 0 )
@@ -400,7 +400,11 @@
 		va_start(va, fmt);
 		char * base = (char*)malloc( CurMal + 1 );
 		#if defined(WIN32)
-		  int len = _vsnprintf( base, CurMal, fmt, va );
+			#if defined( LEAN_HG )
+				int len = _vsnprintf( base, CurMal, fmt, va );
+			#else
+				int len = _vsnprintf_s( base, CurMal, CurMal, fmt, va );
+			#endif
 		#else
 		  int len = vsnprintf( base, CurMal, fmt, va );
 		#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hgengine-cvs] SF.net SVN: hgengine:[740] Mercury2/src/MercuryString.cpp

[<axl...@us...>]

Revision: 740
          http://hgengine.svn.sourceforge.net/hgengine/?rev=740&view=rev
Author:   axlecrusher
Date:     2010-05-18 20:22:07 +0000 (Tue, 18 May 2010)

Log Message:
-----------
Try new hash function

Modified Paths:
--------------
    Mercury2/src/MercuryString.cpp

Modified: Mercury2/src/MercuryString.cpp
===================================================================
--- Mercury2/src/MercuryString.cpp	2010-05-18 20:21:39 UTC (rev 739)
+++ Mercury2/src/MercuryString.cpp	2010-05-18 20:22:07 UTC (rev 740)
@@ -348,7 +348,7 @@
 }
 
 unsigned int MString::hash() const
-{
+{/*
 	unsigned int ret = 0;
 	unsigned int i;
 	unsigned int j = size()>>2;
@@ -359,6 +359,15 @@
 		ret += (unsigned int)(unsigned char)m_sCur[i];
 
 	return ret;
+	*/
+	unsigned long hash = 5381;
+	int c;
+	unsigned char* s = (unsigned char*)m_sCur;
+	
+	while ( (c = *s++) )
+		hash = hash * 33 ^ c;
+
+	return hash;
 }
 
 void MString::resize( unsigned int size )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hgengine-cvs] SF.net SVN: hgengine:[773] Mercury2/src/MercuryString.cpp

[<cn...@us...>]

Revision: 773
          http://hgengine.svn.sourceforge.net/hgengine/?rev=773&view=rev
Author:   cnlohr
Date:     2013-01-31 05:42:34 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
fix bug when right on boundary

Modified Paths:
--------------
    Mercury2/src/MercuryString.cpp

Modified: Mercury2/src/MercuryString.cpp
===================================================================
--- Mercury2/src/MercuryString.cpp	2010-12-18 00:10:19 UTC (rev 772)
+++ Mercury2/src/MercuryString.cpp	2013-01-31 05:42:34 UTC (rev 773)
@@ -431,8 +431,8 @@
 
 		va_end( va );
 
-		if (len > CurMal)
-			while (CurMal < len)
+		if (len >= CurMal)
+			while (CurMal <= len)
 				CurMal*=2;
 		else
 			if ( len > 0 )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.