commit 200858b24037b44ea4cead864b3c7fafe1a4795e Author: devhc Date: Fri May 13 18:26:18 2011 +0200 bg_lib stuff @ ~r1880 diff --git a/src/game/bg_lib.c b/src/game/bg_lib.c index 5f03111..5170d5f 100644 --- a/src/game/bg_lib.c +++ b/src/game/bg_lib.c @@ -327,17 +327,21 @@ int toupper( int c ) void *memmove( void *dest, const void *src, size_t count ) { - int i; + size_t i; if( dest > src ) { - for( i = count - 1; i >= 0; i-- ) - ( (char *)dest )[ i ] = ( (char *)src )[ i ]; + i = count; + while( i > 0 ) + { + i--; + ((char *)dest)[ i ] = ((char *)src)[ i ]; + } } else { for( i = 0; i < count; i++ ) - ( (char *)dest )[ i ] = ( (char *)src )[ i ]; + ((char *) dest)[ i ] = ((char *)src)[ i ]; } return dest; @@ -2381,13 +2385,8 @@ static int dopr (char *buffer, size_t maxlen, const char *format, va_list args) break; /* some picky compilers need this */ } } - if (buffer != NULL) - { - if (currlen < maxlen - 1) - buffer[currlen] = '\0'; - else - buffer[maxlen - 1] = '\0'; - } + if (maxlen > 0) + buffer[currlen] = '\0'; return total; } @@ -2710,8 +2709,6 @@ static int dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c) int Q_vsnprintf(char *str, size_t length, const char *fmt, va_list args) { - if (str != NULL) - str[0] = 0; return dopr(str, length, fmt, args); } diff --git a/src/game/bg_lib.h b/src/game/bg_lib.h index aafdd8f..8e7ed03 100644 --- a/src/game/bg_lib.h +++ b/src/game/bg_lib.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define NULL ((void *)0) #endif -typedef int size_t; +typedef unsigned size_t; typedef char * va_list; #define _INTSIZEOF(n) ( (sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1) )