[286] | 1 | // This file is a part of Framsticks SDK. http://www.framsticks.com/ |
---|
[970] | 2 | // Copyright (C) 1999-2020 Maciej Komosinski and Szymon Ulatowski. |
---|
[286] | 3 | // See LICENSE.txt for details. |
---|
[109] | 4 | |
---|
| 5 | #include "sstring.h" |
---|
[222] | 6 | #include <common/nonstd.h> //to be sure the vsnprintf-related stuff gets included |
---|
[109] | 7 | |
---|
| 8 | #ifdef SSTRING_SIMPLE |
---|
| 9 | |
---|
| 10 | // simple sstring implementation using direct character arrays |
---|
| 11 | // - duplicate = copy all characters |
---|
| 12 | // - no mutex needed |
---|
| 13 | |
---|
| 14 | #include "sstring-simple.cpp" |
---|
| 15 | |
---|
| 16 | #else |
---|
| 17 | /////////////////////////////////////////////////////////////////////////// |
---|
| 18 | // old sstring implementation using SBuf references |
---|
| 19 | // - duplicate = copy buffer pointer |
---|
| 20 | // - mutex required to be thread safe |
---|
| 21 | |
---|
| 22 | #include <common/nonstd_stl.h> |
---|
| 23 | #include "extvalue.h" |
---|
| 24 | #include <assert.h> |
---|
[970] | 25 | #include <common/nonstd_math.h> |
---|
[109] | 26 | |
---|
| 27 | #ifdef MULTITHREADED |
---|
| 28 | #include <pthread.h> |
---|
[793] | 29 | static pthread_mutex_t sstring_ref_lock = PTHREAD_MUTEX_INITIALIZER; |
---|
[109] | 30 | #define REF_LOCK pthread_mutex_lock(&sstring_ref_lock); |
---|
| 31 | #define REF_UNLOCK pthread_mutex_unlock(&sstring_ref_lock) |
---|
| 32 | #else |
---|
| 33 | #define REF_LOCK |
---|
| 34 | #define REF_UNLOCK |
---|
| 35 | #endif |
---|
| 36 | |
---|
| 37 | static int guessMemSize(int request) |
---|
| 38 | { |
---|
[793] | 39 | return request + min(request / 2, 10000) + 8; |
---|
[109] | 40 | } |
---|
| 41 | |
---|
| 42 | SBuf::SBuf() |
---|
| 43 | { |
---|
[793] | 44 | txt = (char*)""; |
---|
| 45 | size = used = 0; |
---|
| 46 | refcount = 1; |
---|
[109] | 47 | } |
---|
| 48 | |
---|
| 49 | SBuf::SBuf(int initsize) |
---|
| 50 | { |
---|
[793] | 51 | size = guessMemSize(initsize); |
---|
[889] | 52 | if (size > 0) { txt = (char*)malloc(size + 1); txt[0] = 0; } |
---|
[793] | 53 | else txt = (char*)""; |
---|
| 54 | used = 0; |
---|
| 55 | refcount = 1; |
---|
[109] | 56 | } |
---|
| 57 | |
---|
| 58 | SBuf::~SBuf() |
---|
| 59 | { |
---|
[793] | 60 | freeBuf(); |
---|
[109] | 61 | } |
---|
| 62 | |
---|
| 63 | void SBuf::initEmpty() |
---|
| 64 | { |
---|
[793] | 65 | txt = (char*)""; |
---|
| 66 | used = size = 0; |
---|
| 67 | refcount = 1; |
---|
[109] | 68 | } |
---|
| 69 | |
---|
| 70 | void SBuf::freeBuf() |
---|
| 71 | { |
---|
[793] | 72 | if (!size) return; |
---|
| 73 | free(txt); used = 0; |
---|
[109] | 74 | } |
---|
| 75 | |
---|
[793] | 76 | void SBuf::copyFrom(const char *ch, int chlen) |
---|
[109] | 77 | { |
---|
[793] | 78 | if (chlen == -1) chlen = strlen(ch); |
---|
| 79 | if (chlen > 0) |
---|
[109] | 80 | { |
---|
[793] | 81 | if (chlen < size) |
---|
| 82 | { |
---|
| 83 | memmove(txt, ch, chlen); |
---|
| 84 | } |
---|
| 85 | else |
---|
| 86 | { |
---|
| 87 | size = guessMemSize(chlen); |
---|
| 88 | char *newtxt = (char*)malloc(size + 1); |
---|
| 89 | memcpy(newtxt, ch, chlen); |
---|
| 90 | free(txt); |
---|
| 91 | txt = newtxt; |
---|
| 92 | } |
---|
[109] | 93 | } |
---|
[793] | 94 | txt[chlen] = 0; |
---|
| 95 | used = chlen; |
---|
[109] | 96 | } |
---|
| 97 | |
---|
[793] | 98 | void SBuf::append(const char *ch, int chlen) |
---|
[109] | 99 | { // doesn't check anything! |
---|
[793] | 100 | memmove(txt + used, ch, chlen); |
---|
| 101 | used += chlen; |
---|
| 102 | txt[used] = 0; |
---|
[109] | 103 | } |
---|
| 104 | |
---|
| 105 | void SBuf::ensureSize(int needed) |
---|
| 106 | { |
---|
[793] | 107 | if (size >= needed) return; |
---|
| 108 | needed = guessMemSize(needed); |
---|
| 109 | txt = (char*)realloc(txt, needed + 1); |
---|
| 110 | size = needed; |
---|
[109] | 111 | } |
---|
| 112 | |
---|
| 113 | ///////////////////////////////////////////// |
---|
| 114 | |
---|
| 115 | SString::SString() |
---|
| 116 | { |
---|
[793] | 117 | initEmpty(); |
---|
[109] | 118 | } |
---|
| 119 | |
---|
| 120 | SString::~SString() |
---|
| 121 | { |
---|
[793] | 122 | REF_LOCK; |
---|
| 123 | detach(); |
---|
| 124 | REF_UNLOCK; |
---|
[109] | 125 | } |
---|
| 126 | |
---|
[793] | 127 | SString::SString(const char *t, int t_len) |
---|
[109] | 128 | { |
---|
[793] | 129 | initEmpty(); |
---|
| 130 | if (!t) return; |
---|
| 131 | copyFrom(t, t_len); |
---|
[109] | 132 | } |
---|
| 133 | |
---|
[367] | 134 | SString::SString(SString&& from) |
---|
| 135 | { |
---|
[793] | 136 | buf = from.buf; |
---|
| 137 | from.buf = &SBuf::empty(); |
---|
[367] | 138 | } |
---|
| 139 | |
---|
[109] | 140 | SString::SString(const SString &from) |
---|
| 141 | { |
---|
[793] | 142 | if (from.buf == &SBuf::empty()) |
---|
| 143 | buf = &SBuf::empty(); |
---|
| 144 | else |
---|
[109] | 145 | { |
---|
[793] | 146 | REF_LOCK; |
---|
| 147 | buf = from.buf; |
---|
| 148 | if (buf->size) |
---|
| 149 | buf->refcount++; |
---|
| 150 | REF_UNLOCK; |
---|
[109] | 151 | } |
---|
| 152 | } |
---|
| 153 | |
---|
[955] | 154 | SString::SString(char in) |
---|
| 155 | { |
---|
| 156 | initEmpty(); |
---|
| 157 | copyFrom(&in, 1); |
---|
| 158 | } |
---|
| 159 | |
---|
[109] | 160 | void SString::initEmpty() |
---|
| 161 | { |
---|
[793] | 162 | buf = &SBuf::empty(); |
---|
[109] | 163 | } |
---|
| 164 | |
---|
| 165 | void SString::detachEmpty(int ensuresize) |
---|
| 166 | { |
---|
[793] | 167 | if (buf == &SBuf::empty()) { buf = new SBuf(ensuresize); return; } |
---|
| 168 | if (buf->refcount < 2) buf->ensureSize(ensuresize); |
---|
| 169 | else |
---|
[109] | 170 | { |
---|
[793] | 171 | buf->refcount--; |
---|
| 172 | buf = new SBuf(ensuresize); |
---|
[109] | 173 | } |
---|
| 174 | } |
---|
| 175 | |
---|
| 176 | void SString::detach() |
---|
| 177 | { |
---|
[793] | 178 | if (buf == &SBuf::empty()) return; |
---|
| 179 | if (!--buf->refcount) delete buf; |
---|
[109] | 180 | } |
---|
| 181 | |
---|
| 182 | void SString::detachCopy(int ensuresize) |
---|
| 183 | { |
---|
[793] | 184 | if (buf == &SBuf::empty()) { buf = new SBuf(ensuresize); return; } |
---|
| 185 | if (buf->refcount < 2) |
---|
[109] | 186 | { |
---|
[793] | 187 | buf->ensureSize(ensuresize); |
---|
| 188 | return; |
---|
[109] | 189 | } |
---|
[793] | 190 | buf->refcount--; |
---|
| 191 | SBuf *newbuf = new SBuf(ensuresize); |
---|
| 192 | newbuf->copyFrom(buf->txt, min(ensuresize, buf->used)); |
---|
| 193 | buf = newbuf; |
---|
[109] | 194 | } |
---|
| 195 | |
---|
| 196 | char *SString::directWrite(int ensuresize) |
---|
| 197 | { |
---|
[973] | 198 | if (ensuresize < 0) ensuresize = length(); |
---|
[793] | 199 | REF_LOCK; |
---|
| 200 | detachCopy(ensuresize); |
---|
| 201 | REF_UNLOCK; |
---|
| 202 | appending = buf->used; |
---|
| 203 | return buf->txt; |
---|
[109] | 204 | } |
---|
| 205 | |
---|
| 206 | /* |
---|
| 207 | char *SString::directWrite() |
---|
| 208 | { |
---|
| 209 | return directWrite(buf->used); |
---|
| 210 | } |
---|
| 211 | */ |
---|
| 212 | char *SString::directAppend(int maxappend) |
---|
| 213 | { |
---|
[793] | 214 | REF_LOCK; |
---|
| 215 | detachCopy(buf->used + maxappend); |
---|
| 216 | REF_UNLOCK; |
---|
| 217 | appending = buf->used; |
---|
| 218 | return buf->txt + appending; |
---|
[109] | 219 | } |
---|
| 220 | |
---|
| 221 | void SString::endWrite(int newlength) |
---|
| 222 | { |
---|
[793] | 223 | if (newlength < 0) newlength = strlen(buf->txt); |
---|
[989] | 224 | else |
---|
| 225 | { |
---|
| 226 | if ((newlength >= (buf->size + 1)) || (buf->size == 0)) |
---|
| 227 | { |
---|
[996] | 228 | logMessage("SString", "endWrite", LOG_CRITICAL, "newlength >= allocated or nothing allocated"); |
---|
[989] | 229 | assert((newlength < (buf->size + 1)) && (buf->size > 0)); |
---|
| 230 | if (buf->size == 0) return; |
---|
| 231 | newlength = buf->size; |
---|
| 232 | } |
---|
| 233 | buf->txt[newlength] = 0; |
---|
| 234 | } |
---|
[793] | 235 | buf->used = newlength; |
---|
[109] | 236 | } |
---|
| 237 | |
---|
| 238 | void SString::endAppend(int newappend) |
---|
| 239 | { |
---|
[989] | 240 | if (newappend < 0) endWrite(appending + strlen(buf->txt + appending)); |
---|
| 241 | else endWrite(newappend + appending); |
---|
[109] | 242 | } |
---|
| 243 | |
---|
| 244 | ////////////// append ///////////////// |
---|
| 245 | |
---|
| 246 | void SString::operator+=(const char *s) |
---|
| 247 | { |
---|
[793] | 248 | if (!s) return; |
---|
| 249 | int x = strlen(s); |
---|
| 250 | if (!x) return; |
---|
| 251 | append(s, x); |
---|
[109] | 252 | } |
---|
| 253 | |
---|
[793] | 254 | void SString::append(const char *txt, int count) |
---|
[109] | 255 | { |
---|
[793] | 256 | if (!count) return; |
---|
| 257 | REF_LOCK; |
---|
| 258 | detachCopy(buf->used + count); |
---|
| 259 | REF_UNLOCK; |
---|
| 260 | buf->append(txt, count); |
---|
[109] | 261 | } |
---|
| 262 | |
---|
| 263 | void SString::operator+=(const SString&s) |
---|
| 264 | { |
---|
[973] | 265 | append(s.c_str(), s.length()); |
---|
[109] | 266 | } |
---|
| 267 | |
---|
| 268 | SString SString::operator+(const SString& s) const |
---|
| 269 | { |
---|
[793] | 270 | SString ret(*this); |
---|
| 271 | ret += s; |
---|
| 272 | return ret; |
---|
[109] | 273 | } |
---|
| 274 | |
---|
| 275 | ///////////////////////////// |
---|
| 276 | |
---|
[793] | 277 | void SString::copyFrom(const char *ch, int chlen) |
---|
[109] | 278 | { |
---|
[793] | 279 | if (!ch) chlen = 0; |
---|
| 280 | else if (chlen < 0) chlen = strlen(ch); |
---|
| 281 | REF_LOCK; |
---|
| 282 | detachEmpty(chlen); |
---|
| 283 | REF_UNLOCK; |
---|
| 284 | memmove(buf->txt, ch, chlen); |
---|
| 285 | buf->txt[chlen] = 0; buf->used = chlen; |
---|
[109] | 286 | } |
---|
| 287 | |
---|
| 288 | void SString::operator=(const char *ch) |
---|
| 289 | { |
---|
[793] | 290 | copyFrom(ch); |
---|
[109] | 291 | } |
---|
| 292 | |
---|
| 293 | void SString::operator=(const SString&s) |
---|
| 294 | { |
---|
[793] | 295 | if (s.buf == buf) return; |
---|
| 296 | REF_LOCK; |
---|
| 297 | detach(); |
---|
| 298 | buf = s.buf; |
---|
| 299 | if (buf->size) buf->refcount++; |
---|
| 300 | REF_UNLOCK; |
---|
[109] | 301 | } |
---|
| 302 | /////////////////////////////////////// |
---|
| 303 | |
---|
[973] | 304 | SString SString::substr(int begin, int numchars) const |
---|
[109] | 305 | { |
---|
[973] | 306 | if (begin < 0) { numchars += begin; begin = 0; } |
---|
| 307 | if (numchars >= (length() - begin)) numchars = length() - begin; |
---|
| 308 | if (numchars <= 0) return SString(); |
---|
| 309 | if (numchars == length()) return *this; |
---|
| 310 | return SString((*this)(begin), numchars); |
---|
[109] | 311 | } |
---|
| 312 | |
---|
| 313 | /////////////////////////////////////// |
---|
| 314 | |
---|
[247] | 315 | bool SString::equals(const SString& s) const |
---|
[109] | 316 | { |
---|
[793] | 317 | if (s.buf == buf) return true; |
---|
| 318 | return strcmp(buf->txt, s.buf->txt) == 0; |
---|
[109] | 319 | } |
---|
| 320 | |
---|
| 321 | /////////////////////////////////////// |
---|
| 322 | |
---|
[793] | 323 | int SString::indexOf(int character, int start) const |
---|
[109] | 324 | { |
---|
[793] | 325 | const char *found = strchr(buf->txt + start, character); |
---|
| 326 | return found ? found - buf->txt : -1; |
---|
[109] | 327 | } |
---|
| 328 | |
---|
[793] | 329 | int SString::indexOf(const char *substring, int start) const |
---|
[109] | 330 | { |
---|
[793] | 331 | char *found = strstr(buf->txt + start, substring); |
---|
| 332 | return found ? found - buf->txt : -1; |
---|
[109] | 333 | } |
---|
| 334 | |
---|
[793] | 335 | int SString::indexOf(const SString & substring, int start) const |
---|
[109] | 336 | { |
---|
[793] | 337 | char *found = strstr(buf->txt + start, substring.c_str()); |
---|
| 338 | return found ? found - buf->txt : -1; |
---|
[109] | 339 | } |
---|
| 340 | |
---|
[793] | 341 | bool SString::getNextToken(int& pos, SString &token, char separator) const |
---|
[109] | 342 | { |
---|
[973] | 343 | if (pos >= length()) { token = 0; return false; } |
---|
[793] | 344 | int p1 = pos, p2; |
---|
| 345 | const char *t1 = buf->txt + pos; |
---|
| 346 | const char *t2 = strchr(t1, separator); |
---|
[973] | 347 | if (t2) pos = (p2 = (t2 - buf->txt)) + 1; else p2 = pos = length(); |
---|
[793] | 348 | strncpy(token.directWrite(p2 - p1), t1, p2 - p1); |
---|
| 349 | token.endWrite(p2 - p1); |
---|
| 350 | return true; |
---|
[109] | 351 | } |
---|
| 352 | |
---|
[395] | 353 | bool SString::startsWith(const char *pattern) const |
---|
[109] | 354 | { |
---|
[793] | 355 | const char *t = this->c_str(); |
---|
| 356 | for (; *pattern; pattern++, t++) |
---|
| 357 | if (*t != *pattern) return false; |
---|
| 358 | return true; |
---|
[109] | 359 | } |
---|
| 360 | |
---|
| 361 | SString SString::valueOf(int i) |
---|
| 362 | { |
---|
[793] | 363 | return SString::sprintf("%d", i); |
---|
[109] | 364 | } |
---|
| 365 | SString SString::valueOf(long i) |
---|
| 366 | { |
---|
[793] | 367 | return SString::sprintf("%d", i); |
---|
[109] | 368 | } |
---|
| 369 | SString SString::valueOf(double d) |
---|
| 370 | { |
---|
[826] | 371 | SString tmp; |
---|
[889] | 372 | char* here = tmp.directWrite(30); |
---|
[970] | 373 | tmp.endWrite(doubleToString(d, -1, here, 30)); |
---|
[793] | 374 | if ((!strchr(tmp.c_str(), '.')) && (!strchr(tmp.c_str(), 'e'))) tmp += ".0"; |
---|
| 375 | return tmp; |
---|
[109] | 376 | } |
---|
| 377 | SString SString::valueOf(const SString& s) |
---|
| 378 | { |
---|
[793] | 379 | return s; |
---|
[109] | 380 | } |
---|
| 381 | |
---|
| 382 | #if 0 //testing _vscprintf |
---|
| 383 | #define USE_VSCPRINTF |
---|
[793] | 384 | int _vscprintf(const char *format, va_list argptr) |
---|
[109] | 385 | { |
---|
[793] | 386 | return vsnprintf("", 0, format, argptr); |
---|
[109] | 387 | } |
---|
| 388 | #endif |
---|
| 389 | |
---|
| 390 | SString SString::sprintf(const char* format, ...) |
---|
| 391 | { |
---|
[793] | 392 | int n, size = 30; |
---|
| 393 | va_list ap; |
---|
[109] | 394 | |
---|
[793] | 395 | SString ret; |
---|
[109] | 396 | |
---|
| 397 | #ifdef USE_VSCPRINTF |
---|
[793] | 398 | va_start(ap, format); |
---|
| 399 | size = _vscprintf(format, ap); |
---|
| 400 | va_end(ap); |
---|
[109] | 401 | #endif |
---|
| 402 | |
---|
[793] | 403 | while (1) |
---|
[109] | 404 | { |
---|
[793] | 405 | char* p = ret.directWrite(size); |
---|
| 406 | assert(p != NULL); |
---|
[973] | 407 | size = ret.capacity() + 1; |
---|
[793] | 408 | /* Try to print in the allocated space. */ |
---|
| 409 | va_start(ap, format); |
---|
| 410 | n = vsnprintf(p, size, format, ap); |
---|
| 411 | va_end(ap); |
---|
| 412 | /* If that worked, return the string. */ |
---|
[897] | 413 | |
---|
| 414 | #ifdef __ANDROID__ |
---|
| 415 | //Workaround for Android bug. /system/lib64/libc.so? maybe only arm 64-bit? "If an encoding error occurs, a negative number is returned". On some devices keeps returning -1 forever. |
---|
| 416 | //https://github.com/android-ndk/ndk/issues/879 but unfortunately during google play tests (Firebase Test Lab) this problem turned out to be not limited to Chinese devices and occurred in Mate 9, Galaxy S9, Pixel, Pixel 2, Moto Z (even with the en_GB locale; the locale is not important but the problem seem to be utf8 non-ascii chars in the format string). |
---|
| 417 | if (n < 0 && size >= (1 << 24)) //wants more than 16M |
---|
| 418 | { |
---|
[1040] | 419 | p[size - 1] = 0; //just to ensure there is at least some ending \0 in memory... who knows what buggy vsnprintf() did. |
---|
| 420 | __android_log_print(ANDROID_LOG_ERROR, LOG_APP_NAME, "Giving up due to Android bug: vsnprintf() wants more than %d bytes, it used %zu bytes, for format='%s'", size, strlen(p), format); |
---|
[897] | 421 | //in my tests, it always used 0 bytes, so it produced a 0-length string: "" |
---|
[1040] | 422 | va_start(ap, format); |
---|
| 423 | n = vsnprintf(p, size, format, ap); //hoping 16M is enough |
---|
| 424 | va_end(ap); |
---|
| 425 | __android_log_print(ANDROID_LOG_INFO, LOG_APP_NAME, "Fallback to vsprintf() produced string: '%s'", p); |
---|
[897] | 426 | if (n < 0) //vsprintf was also buggy. If we were strict, we should abort the app now. |
---|
| 427 | { |
---|
[1040] | 428 | strcpy(p, "[STR_ERR] "); //a special prefix just to indicate the returned string is incorrect |
---|
| 429 | strcat(p, format); //append and return the original formatting string |
---|
| 430 | __android_log_print(ANDROID_LOG_ERROR, LOG_APP_NAME, "vsprintf() also failed, using the incorrect resulting string: '%s'", p); |
---|
[897] | 431 | } |
---|
[1040] | 432 | n = strlen(p); //pretend vsnprintf() or vsprintf() was OK to exit the endless loop |
---|
[897] | 433 | } |
---|
| 434 | #endif |
---|
| 435 | |
---|
[793] | 436 | if (n > -1 && n < size) |
---|
[109] | 437 | { |
---|
[793] | 438 | ret.endWrite(n); |
---|
| 439 | return ret; |
---|
[109] | 440 | } |
---|
[793] | 441 | /* Else try again with more space. */ |
---|
[109] | 442 | #ifdef VSNPRINTF_RETURNS_REQUIRED_SIZE |
---|
[793] | 443 | if (n > -1) /* glibc 2.1 */ |
---|
| 444 | size = n; /* precisely what is needed */ |
---|
| 445 | else /* glibc 2.0 */ |
---|
[109] | 446 | #endif |
---|
[793] | 447 | size *= 2; /* twice the old size */ |
---|
[109] | 448 | } |
---|
| 449 | } |
---|
| 450 | |
---|
| 451 | SString &SString::empty() |
---|
| 452 | { |
---|
[793] | 453 | static SString empty; |
---|
| 454 | return empty; |
---|
[109] | 455 | } |
---|
| 456 | |
---|
| 457 | SBuf &SBuf::empty() |
---|
| 458 | { |
---|
[793] | 459 | static SBuf empty; |
---|
| 460 | return empty; |
---|
[109] | 461 | } |
---|
| 462 | |
---|
| 463 | #endif //#ifdef SSTRING_SIMPLE |
---|
[347] | 464 | |
---|
| 465 | ////////////////////////////////////////////////// |
---|
| 466 | // to be moved somewhere else? |
---|
| 467 | // public domain source: http://isthe.com/chongo/src/fnv |
---|
| 468 | typedef uint32_t Fnv32_t; |
---|
| 469 | |
---|
| 470 | #define FNV_32_PRIME ((Fnv32_t)0x01000193) |
---|
| 471 | #define FNV1_32_INIT ((Fnv32_t)0x811c9dc5) |
---|
| 472 | #define FNV1_32A_INIT FNV1_32_INIT |
---|
| 473 | |
---|
| 474 | Fnv32_t fnv_32a_buf(void *buf, size_t len, Fnv32_t hval) |
---|
| 475 | { |
---|
[793] | 476 | unsigned char *bp = (unsigned char *)buf; /* start of buffer */ |
---|
| 477 | unsigned char *be = bp + len; /* beyond end of buffer */ |
---|
[347] | 478 | |
---|
[793] | 479 | while (bp < be) { |
---|
[347] | 480 | |
---|
[793] | 481 | /* xor the bottom with the current octet */ |
---|
| 482 | hval ^= (Fnv32_t)*bp++; |
---|
[347] | 483 | |
---|
[793] | 484 | /* multiply by the 32 bit FNV magic prime mod 2^32 */ |
---|
[347] | 485 | #if defined(NO_FNV_GCC_OPTIMIZATION) |
---|
[793] | 486 | hval *= FNV_32_PRIME; |
---|
[347] | 487 | #else |
---|
[793] | 488 | hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24); |
---|
[347] | 489 | #endif |
---|
| 490 | |
---|
[793] | 491 | } |
---|
[347] | 492 | |
---|
[793] | 493 | /* return our new hash value */ |
---|
| 494 | return hval; |
---|
[347] | 495 | } |
---|
| 496 | ////////////////////////////////////////////////// |
---|
| 497 | |
---|
| 498 | #ifdef SSTRING_SIMPLE |
---|
| 499 | uint32_t SString::hash() const |
---|
| 500 | { |
---|
[793] | 501 | return fnv_32a_buf(txt, used, FNV1_32A_INIT); |
---|
[347] | 502 | } |
---|
| 503 | #else |
---|
| 504 | uint32_t SBuf::hash() const |
---|
| 505 | { |
---|
[793] | 506 | return fnv_32a_buf(txt, used, FNV1_32A_INIT); |
---|
[347] | 507 | } |
---|
| 508 | #endif |
---|