[lightlang] r934 committed - Рефакторинг

[ligh...@googlecode.com]

Revision: 934
Author: mdevaev
Date: Sun Feb 14 01:43:59 2010
Log: Рефакторинг
http://code.google.com/p/lightlang/source/detail?r=934

Modified:
/trunk/lightlang/apps/sl/src/mstring.c

=======================================
--- /trunk/lightlang/apps/sl/src/mstring.c Wed Jan 20 08:11:40 2010
+++ /trunk/lightlang/apps/sl/src/mstring.c Sun Feb 14 01:43:59 2010
@@ -47,11 +47,13 @@
void del_nl(char *str)
{
for(; (*str); str++)
+ {
if ( (*str) == '\n' )
{
(*str) = '\0';
break;
}
+ }
}


/********************************************************************************
@@ -104,8 +106,7 @@

memset(&mbstate, 0, sizeof(mbstate));

- for (; ((str_offset = mbrtowc(ptr_str_wc, str, sizeof(wchar_t),
&mbstate)) > 0) && count;
- ++ptr_str_wc, str += str_offset, --count)
+ for (; ((str_offset = mbrtowc(ptr_str_wc, str, sizeof(wchar_t),
&mbstate)) > 0) && count; ++ptr_str_wc, str += str_offset, --count)
(*ptr_str_wc) = towlower(*ptr_str_wc);

(*ptr_str_wc) = L'\0';
@@ -114,7 +115,8 @@
str_wc[0] = L'\0';
return NULL;
}
- else return str_wc;
+
+ return str_wc;
}


/********************************************************************************
@@ -134,8 +136,7 @@

memset(&mbstate, 0, sizeof(mbstate));

- for (; ((str_offset = mbrtowc(ptr_str_wc, str, sizeof(wchar_t),
&mbstate)) > 0) && count;
- ++ptr_str_wc, str += str_offset, --count)
+ for (; ((str_offset = mbrtowc(ptr_str_wc, str, sizeof(wchar_t),
&mbstate)) > 0) && count; ++ptr_str_wc, str += str_offset, --count)
{
(*ptr_str_wc) = towlower(*ptr_str_wc);

@@ -209,7 +210,8 @@
{
for (; (*str1_wc); str1_wc++, str2_wc++)
{
- if ( (*str1_wc) != (*str2_wc) ) ++error_count;
+ if ( (*str1_wc) != (*str2_wc) )
+ ++error_count;

if ( error_count > search_exact ) return 1;
}
@@ -226,7 +228,10 @@
++error_count;
++str2_wc;
}
- else ++error_count;
+ else
+ {
+ ++error_count;
+ }

if ( (error_count + (str2_wc_len - str1_wc_len)) > search_exact )
return 1;
@@ -234,7 +239,7 @@

if ( (error_count + (str2_wc_len - str1_wc_len)) <= search_exact )
return 0;
- else return 1;
+ return 1;
}
else
{
@@ -246,7 +251,10 @@
++error_count;
++str1_wc;
}
- else ++error_count;
+ else
+ {
+ ++error_count;
+ }

if ( (error_count + (str1_wc_len - str2_wc_len)) > search_exact )
return 1;
@@ -254,7 +262,7 @@

if ( (error_count + (str1_wc_len - str2_wc_len)) <= search_exact )
return 0;
- else return 1;
+ return 1;
}
}