HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/kernel/generic/src/lib/string.c @ 4223

  → /trunk/kernel/generic/src/lib/string.c @ 4224

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 4223 → Rev 4224

/trunk/kernel/generic/src/lib/string.c
458,32 → 458,27
*/
int str_cmp(const char *s1, const char *s2)
{
wchar_t c1;
wchar_t c2;
wchar_t c1 = 0;
wchar_t c2 = 0;
size_t off1 = 0;
size_t off2 = 0;
while ((c1 = str_decode(s1, &off1, STR_NO_LIMIT) != 0)
&& (c2 = str_decode(s2, &off2, STR_NO_LIMIT) != 0)) {
if (off1 != off2)
break;
while (true) {
c1 = str_decode(s1, &off1, STR_NO_LIMIT);
c2 = str_decode(s2, &off2, STR_NO_LIMIT);
if (c1 < c2)
return -1;
if (c1 > c2)
return 1;
if (c1 == 0 || c2 == 0)
break;
}
if ((off1 == off2) && (c1 == c2))
return 0;
if ((c1 == 0) || (off1 < off2))
return -1;
return 1;
return 0;
}
/** Compare two NULL terminated strings with length limit.
509,30 → 504,28
size_t off2 = 0;
count_t len = 0;
while ((len < max_len)
&& ((c1 = str_decode(s1, &off1, STR_NO_LIMIT)) != 0)
&& ((c2 = str_decode(s2, &off2, STR_NO_LIMIT)) != 0)) {
if (off1 != off2)
while (true) {
if (len >= max_len)
break;
c1 = str_decode(s1, &off1, STR_NO_LIMIT);
c2 = str_decode(s2, &off2, STR_NO_LIMIT);
if (c1 < c2)
return -1;
if (c1 > c2)
return 1;
len++;
if (c1 == 0 || c2 == 0)
break;
++len;
}
if ((off1 == off2) && (len == max_len) && (c1 == c2))
return 0;
if ((c1 == 0) || (off1 < off2))
return -1;
return 1;
return 0;
}
/** Copy NULL-terminated string.
558,7 → 551,7
size_t str_off = 0;
size_t dst_off = 0;
while ((ch = str_decode(src, &str_off, STR_NO_LIMIT) != 0)) {
while ((ch = str_decode(src, &str_off, STR_NO_LIMIT)) != 0) {
if (chr_encode(ch, dst, &dst_off, size) != EOK)
break;
}
616,7 → 609,7
wchar_t acc;
size_t off = 0;
while ((acc = str_decode(str, &off, STR_NO_LIMIT) != 0)) {
while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
if (acc == ch)
return (str + off);
}