diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-12-10 06:08:39 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-12-10 06:08:39 +0000 |
| commit | 35c3a7f525b18ab01a62d97c70e533e4fd6e5b23 (patch) | |
| tree | 4c73b319a9e6b8ae41311c4f205103d95d6719b3 | |
| parent | c4c586a6523387d0b9459c1e5e9b9584e28bd0be (diff) | |
| download | php-git-35c3a7f525b18ab01a62d97c70e533e4fd6e5b23.tar.gz | |
Expose the macro globally
| -rw-r--r-- | ext/standard/file.c | 32 | ||||
| -rw-r--r-- | ext/standard/php_string.h | 10 |
2 files changed, 21 insertions, 21 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 55c0096ba2..c580714713 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1718,28 +1718,18 @@ PHPAPI PHP_FUNCTION(fread) } /* }}} */ -#ifndef HAVE_MBLEN -# define _php_mblen(ptr, len) 1 -#else -# if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T) -# define _php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state))) -# else -# define _php_mblen(ptr, len) mblen(ptr, len) -# endif -#endif - static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t len, const char delimiter TSRMLS_DC) { int inc_len; unsigned char last_chars[2] = { 0, 0 }; while (len > 0) { - inc_len = (*ptr == '\0' ? 1: _php_mblen(ptr, len)); + inc_len = (*ptr == '\0' ? 1: php_mblen(ptr, len)); switch (inc_len) { case -2: case -1: inc_len = 1; - _php_mblen(NULL, 0); + php_mblen(NULL, 0); break; case 0: goto quit_loop; @@ -1839,7 +1829,7 @@ PHP_FUNCTION(fgetcsv) } } /* initialize internal state */ - _php_mblen(NULL, 0); + php_mblen(NULL, 0); /* Now into new section that parses buf for delimiter/enclosure fields */ @@ -1868,12 +1858,12 @@ PHP_FUNCTION(fgetcsv) /* 1. Strip any leading space */ for (;;) { - inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0); + inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0); switch (inc_len) { case -2: case -1: inc_len = 1; - _php_mblen(NULL, 0); + php_mblen(NULL, 0); break; case 0: goto quit_loop_0; @@ -1897,7 +1887,7 @@ PHP_FUNCTION(fgetcsv) /* 2A. handle enclosure delimited field */ for (;;) { - inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0); + inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0); switch (inc_len) { case 0: switch (state) { @@ -1958,7 +1948,7 @@ PHP_FUNCTION(fgetcsv) case -2: case -1: - _php_mblen(NULL, 0); + php_mblen(NULL, 0); /* break is omitted intentionally */ case 1: /* we need to determine if the enclosure is @@ -2021,7 +2011,7 @@ PHP_FUNCTION(fgetcsv) case -2: case -1: inc_len = 1; - _php_mblen(NULL, 0); + php_mblen(NULL, 0); /* break is omitted intentionally */ case 1: if (*bptr == delimiter) { @@ -2032,7 +2022,7 @@ PHP_FUNCTION(fgetcsv) break; } bptr += inc_len; - inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0); + inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0); } quit_loop_3: comp_end = tptr; @@ -2046,14 +2036,14 @@ PHP_FUNCTION(fgetcsv) hunk_begin = bptr; for (;;) { - inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr, limit - bptr)): 0); + inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0); switch (inc_len) { case 0: goto quit_loop_4; case -2: case -1: inc_len = 1; - _php_mblen(NULL, 0); + php_mblen(NULL, 0); /* break is omitted intentionally */ case 1: if (*bptr == delimiter) { diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index dac757b050..a7882dba96 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -144,6 +144,16 @@ PHPAPI char *php_strerror(int errnum); #define strerror php_strerror #endif +#ifndef HAVE_MBLEN +# define php_mblen(ptr, len) 1 +#else +# if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T) +# define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state))) +# else +# define php_mblen(ptr, len) mblen(ptr, len) +# endif +#endif + void register_string_constants(INIT_FUNC_ARGS); #endif /* PHP_STRING_H */ |