[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c

[Marcus B�rger]

helly           Wed Oct 23 19:07:14 2002 EDT

  Modified files:              
    /php4/ext/mbstring  mbstring.c 
  Log:
  fix style and warnings
  
  
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.118 php4/ext/mbstring/mbstring.c:1.119
--- php4/ext/mbstring/mbstring.c:1.118  Wed Oct 23 15:58:37 2002
+++ php4/ext/mbstring/mbstring.c        Wed Oct 23 19:07:14 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.118 2002/10/23 19:58:37 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.119 2002/10/23 23:07:14 helly Exp $ */
 
 /*
  * PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -1511,7 +1511,8 @@
 #define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0)
 
 /* {{{ PHPAPI char *php_mb_strrchr() */
-PHPAPI char *php_mb_strrchr(const char *s, char c TSRMLS_DC){
+PHPAPI char *php_mb_strrchr(const char *s, char c TSRMLS_DC)
+{
        unsigned char *p = (unsigned char *)s, *last = NULL;
        while(*p++) {
                if (*p == c) {
@@ -1530,10 +1531,11 @@
 /* }}} */
 
 /* {{{ PHPAPI int php_mb_is_mb_leadbyte() */
-PHPAPI int php_mb_is_mb_leadbyte(const char *s TSRMLS_DC){
+PHPAPI int php_mb_is_mb_leadbyte(const char *s TSRMLS_DC)
+{
        unsigned char *p = (unsigned char *)s;
        if (MBSTRG(current_language) == mbfl_no_language_japanese 
-               && IS_SJIS1(*p) && IS_SJIS2(*(p+1))){
+               && IS_SJIS1(*p) && IS_SJIS2(*(p+1))) {
                return 1;
        }
        return 0;
@@ -2605,7 +2607,6 @@
 {
        char *str, *from_encoding = 
(char*)mbfl_no2preferred_mime_name(MBSTRG(current_internal_encoding));
        long str_len, from_encoding_len;
-       long case_mode = 0;
        char *newstr;
        size_t ret_len;
 
@@ -2629,7 +2630,6 @@
 {
        char *str, *from_encoding = 
(char*)mbfl_no2preferred_mime_name(MBSTRG(current_internal_encoding));
        long str_len, from_encoding_len;
-       long case_mode = 0;
        char *newstr;
        size_t ret_len;
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php