#define RANDOM_SEED 0xACE55052
#define RANDOM_A 0x00731ADE
#define RANDOM_C 12345
+#define RANDOM_SPRUCE 0xf12b02b
// Jan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec
const short DAYS_BEFORE[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
#define UNIX_TO_2K ((30*365*3600*24) + (7*3600*24)) //Normal years + leap years
* \fn int strucmp(char *Str1, char *Str2)
* \brief Compare \a Str1 and \a Str2 case-insensitively
*/
-int strucmp(char *Str1, char *Str2)
+int strucmp(const char *Str1, const char *Str2)
{
while(*Str1 && tolower(*Str1) == tolower(*Str2))
Str1++, Str2++;
* \fn int strpos(char *Str, char Ch)
* \brief Search a string for an ascii character
*/
-int strpos(char *Str, char Ch)
+int strpos(const char *Str, char Ch)
{
int pos;
for(pos=0;Str[pos];pos++)
* \fn Uint strlen(char *__str)
* \brief Get the length of string
*/
-Uint strlen(char *__str)
+Uint strlen(const char *__str)
{
Uint ret = 0;
while(*__str++) ret++;
* \fn char *strcpy(char *__str1, char *__str2)
* \brief Copy a string to a new location
*/
-char *strcpy(char *__str1, char *__str2)
+char *strcpy(char *__str1, const char *__str2)
{
while(*__str2)
*__str1++ = *__str2++;
* \brief Compare two strings return the difference between
* the first non-matching characters.
*/
-int strcmp(char *str1, char *str2)
+int strcmp(const char *str1, const char *str2)
{
while(*str1 && *str1 == *str2)
str1++, str2++;
* \fn int strncmp(char *Str1, char *Str2, size_t num)
* \brief Compare strings \a Str1 and \a Str2 to a maximum of \a num characters
*/
-int strncmp(char *Str1, char *Str2, size_t num)
+int strncmp(const char *Str1, const char *Str2, size_t num)
{
- while(num-- && *Str1 && *Str1 == *Str2)
+ if(num == 0) return 0; // TODO: Check what should officially happen here
+ while(--num && *Str1 && *Str1 == *Str2)
Str1++, Str2++;
return *Str1-*Str2;
}
* \fn char *strdup(char *str)
* \brief Duplicates a string
*/
-char *strdup(char *str)
+char *strdup(const char *str)
{
char *ret;
ret = malloc(strlen(str)+1);
}
/**
- * \fn int strpos8(char *str, Uint32 search)
+ * \fn int DivUp(int num, int dem)
+ * \brief Divide two numbers, rounding up
+ * \param num Numerator
+ * \param dem Denominator
+ */
+int DivUp(int num, int dem)
+{
+ return (num+dem-1)/dem;
+}
+
+/**
+ * \fn int strpos8(const char *str, Uint32 search)
* \brief Search a string for a UTF-8 character
*/
-int strpos8(char *str, Uint32 Search)
+int strpos8(const char *str, Uint32 Search)
{
int pos;
Uint32 val = 0;
*/
Uint rand()
{
- #if 0
- Uint ret = giRandomState;
- int roll = randomState & 31;
- randomState = (randomState << roll) | (randomState >> (32-roll));
- randomState ^= 0x9A3C5E78;
- return ret;
- #else
+ Uint old = giRandomState;
+ // Get the next state value
giRandomState = (RANDOM_A*giRandomState + RANDOM_C) & 0xFFFFFFFF;
- Log("giRandomState = 0x%x", giRandomState);
+ // Check if it has changed, and if it hasn't, change it
+ if(giRandomState == old) giRandomState += RANDOM_SPRUCE;
return giRandomState;
- #endif
}
EXPORT(timestamp);