Commit 0295e3b4ed41c0f50fe4c81e8da5de32b0320ff9
-
- complement <complement @01b27279-081b-0410…d9d9e0fb0389.>
- Diff rendering mode:
- inline
- side by side
etc/ChangeLog-5.1
(3 / 0)
| 30 | 30 | ||
| 31 | 31 | * stldbg-shared: passed 395 tests; | |
| 32 | 32 | ||
| 33 | * src/c_locale_glibc/c_locale_glibc2.c: this is a C, so | ||
| 34 | decl allowd only on top of block; | ||
| 35 | |||
| 33 | 36 | 2007-09-27 Francois Dumont <dums@users.sourceforge.net> | |
| 34 | 37 | ||
| 35 | 38 | * src/facets_byname.cpp: In collate::do_transform, consider |
| 431 | 431 | char buf1[64], buf2[64]; | |
| 432 | 432 | while (n1 > 0 && n2 > 0) { | |
| 433 | 433 | size_t bufsize1 = n1 < 63 ? n1 : 63; | |
| 434 | strncpy(buf1, s1, bufsize1); buf1[bufsize1] = 0; | ||
| 435 | 434 | size_t bufsize2 = n2 < 63 ? n2 : 63; | |
| 435 | strncpy(buf1, s1, bufsize1); buf1[bufsize1] = 0; | ||
| 436 | 436 | strncpy(buf2, s2, bufsize2); buf2[bufsize2] = 0; | |
| 437 | 437 | ||
| 438 | 438 | ret = strcoll_l(buf1, buf2, (__c_locale)__loc); | |
| … | … | ||
| 451 | 451 | wchar_t buf1[64], buf2[64]; | |
| 452 | 452 | while (n1 > 0 && n2 > 0) { | |
| 453 | 453 | size_t bufsize1 = n1 < 63 ? n1 : 63; | |
| 454 | wcsncpy(buf1, s1, bufsize1); buf1[bufsize1] = 0; | ||
| 455 | 454 | size_t bufsize2 = n2 < 63 ? n2 : 63; | |
| 455 | wcsncpy(buf1, s1, bufsize1); buf1[bufsize1] = 0; | ||
| 456 | 456 | wcsncpy(buf2, s2, bufsize2); buf2[bufsize2] = 0; | |
| 457 | 457 | ||
| 458 | 458 | ret = wcscoll_l(buf1, buf2, (__c_locale)__loc); | |
| … | … | ||
| 469 | 469 | char *dest, size_t dest_n, | |
| 470 | 470 | const char *src, size_t src_n ) | |
| 471 | 471 | { | |
| 472 | const char *real_src; | ||
| 473 | char *buf = NULL; | ||
| 474 | size_t result; | ||
| 475 | |||
| 472 | 476 | if (src_n == 0) | |
| 473 | 477 | { | |
| 474 | 478 | if (dest != NULL) dest[0] = 0; | |
| 475 | 479 | return 0; | |
| 476 | 480 | } | |
| 477 | const char *real_src; | ||
| 478 | char *buf = NULL; | ||
| 479 | 481 | if (src[src_n] != 0) { | |
| 480 | 482 | buf = malloc(src_n + 1); | |
| 481 | 483 | strncpy(buf, src, src_n); | |
| … | … | ||
| 486 | 486 | } | |
| 487 | 487 | else | |
| 488 | 488 | real_src = src; | |
| 489 | size_t result = __strxfrm_l(dest, real_src, dest_n, (__c_locale)__loc); | ||
| 489 | result = __strxfrm_l(dest, real_src, dest_n, (__c_locale)__loc); | ||
| 490 | 490 | if (buf != NULL) free(buf); | |
| 491 | 491 | return result; | |
| 492 | 492 | } | |
| … | … | ||
| 497 | 497 | wchar_t *dest, size_t dest_n, | |
| 498 | 498 | const wchar_t *src, size_t src_n ) | |
| 499 | 499 | { | |
| 500 | const wchar_t *real_src; | ||
| 501 | wchar_t *buf = NULL; | ||
| 502 | size_t result; | ||
| 503 | |||
| 500 | 504 | if (src_n == 0) | |
| 501 | 505 | { | |
| 502 | 506 | if (dest != NULL) dest[0] = 0; | |
| 503 | 507 | return 0; | |
| 504 | 508 | } | |
| 505 | const wchar_t *real_src; | ||
| 506 | wchar_t *buf = NULL; | ||
| 507 | 509 | if (src[src_n] != 0) { | |
| 508 | 510 | buf = malloc((src_n + 1) * sizeof(wchar_t)); | |
| 509 | 511 | wcsncpy(buf, src, src_n); | |
| … | … | ||
| 514 | 514 | } | |
| 515 | 515 | else | |
| 516 | 516 | real_src = src; | |
| 517 | size_t result = __wcsxfrm_l(dest, real_src, dest_n, (__c_locale)__loc); | ||
| 517 | result = __wcsxfrm_l(dest, real_src, dest_n, (__c_locale)__loc); | ||
| 518 | 518 | if (buf != NULL) free(buf); | |
| 519 | 519 | return result; | |
| 520 | 520 | } |
