cvs: php4 /ext/mbstring mbfilter_ru.c
| From: | Den V. Tsopa | Date: | Wed, 29 May 2002 08:33:25 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbfilter_ru.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12156@lists.php.net to get a copy of this message | ||
dets Wed May 29 04:33:25 2002 EDT
Modified files:
/php4/ext/mbstring mbfilter_ru.c
Log:
@Fixed some dummy errors. (dets)
Index: php4/ext/mbstring/mbfilter_ru.c
diff -u php4/ext/mbstring/mbfilter_ru.c:1.3 php4/ext/mbstring/mbfilter_ru.c:1.4
--- php4/ext/mbstring/mbfilter_ru.c:1.3 Fri May 24 18:28:42 2002
+++ php4/ext/mbstring/mbfilter_ru.c Wed May 29 04:33:23 2002
@@ -20,7 +20,7 @@
* "russian code filter and converter"
*/
-/* $Id: mbfilter_ru.c,v 1.3 2002/05/24 22:28:42 hirokawa Exp $ */
+/* $Id: mbfilter_ru.c,v 1.4 2002/05/29 08:33:23 dets Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -74,21 +74,17 @@
{
int s, n;
- if (c >= 0 && c < cp1251_ucs_table_min) {
- s = c;
- } else {
- s = -1;
- n = cp1251_ucs_table_len-1;
- while (n >= 0) {
- if (c == cp1251_ucs_table[n]) {
- s = cp1251_ucs_table_min + n;
- break;
- }
- n--;
- }
- if (s <= 0 && (c & ~MBFL_WCSPLANE_MASK) == MBFL_WCSPLANE_CP1251) {
- s = c & MBFL_WCSPLANE_MASK;
+ s = -1;
+ n = cp1251_ucs_table_len-1;
+ while (n >= 0) {
+ if (c == cp1251_ucs_table[n]) {
+ s = cp1251_ucs_table_min + n;
+ break;
}
+ n--;
+ }
+ if (s <= 0 && (c & ~MBFL_WCSPLANE_MASK) == MBFL_WCSPLANE_CP1251) {
+ s = c & MBFL_WCSPLANE_MASK;
}
if (s >= 0) {
@@ -138,21 +134,17 @@
{
int s, n;
- if (c >= 0 && c < cp866_ucs_table_min) {
- s = c;
- } else {
- s = -1;
- n = cp866_ucs_table_len-1;
- while (n >= 0) {
- if (c == cp866_ucs_table[n]) {
- s = cp866_ucs_table_min + n;
- break;
- }
- n--;
- }
- if (s <= 0 && (c & ~MBFL_WCSPLANE_MASK) == MBFL_WCSPLANE_CP866) {
- s = c & MBFL_WCSPLANE_MASK;
+ s = -1;
+ n = cp866_ucs_table_len-1;
+ while (n >= 0) {
+ if (c == cp866_ucs_table[n]) {
+ s = cp866_ucs_table_min + n;
+ break;
}
+ n--;
+ }
+ if (s <= 0 && (c & ~MBFL_WCSPLANE_MASK) == MBFL_WCSPLANE_CP866) {
+ s = c & MBFL_WCSPLANE_MASK;
}
if (s >= 0) {
@@ -202,21 +194,17 @@
{
int s, n;
- if (c >= 0 && c < koi8r_ucs_table_min) {
- s = c;
- } else {
- s = -1;
- n = koi8r_ucs_table_len-1;
- while (n >= 0) {
- if (c == koi8r_ucs_table[n]) {
- s = koi8r_ucs_table_min + n;
- break;
- }
- n--;
- }
- if (s <= 0 && (c & ~MBFL_WCSPLANE_MASK) == MBFL_WCSPLANE_KOI8R) {
- s = c & MBFL_WCSPLANE_MASK;
+ s = -1;
+ n = koi8r_ucs_table_len-1;
+ while (n >= 0) {
+ if (c == koi8r_ucs_table[n]) {
+ s = koi8r_ucs_table_min + n;
+ break;
}
+ n--;
+ }
+ if (s <= 0 && (c & ~MBFL_WCSPLANE_MASK) == MBFL_WCSPLANE_KOI8R) {
+ s = c & MBFL_WCSPLANE_MASK;
}
if (s >= 0) {
@@ -230,7 +218,7 @@
return c;
}
-#endif /* HAVE_MBSTR_TW */
+#endif /* HAVE_MBSTR_RU */
/*
* Local variables: