diff options
| author | monty@mashka.mysql.fi <> | 2002-06-11 11:20:31 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-06-11 11:20:31 +0300 |
| commit | 2aecdd1a91bf8386829146609ce0219c51793841 (patch) | |
| tree | 8fcaabe013fff43cf466235067f2c47f0cd66531 /sql/udf_example.cc | |
| parent | db41437a100e204e60f45d5c9a6b26f63e512659 (diff) | |
| download | mariadb-git-2aecdd1a91bf8386829146609ce0219c51793841.tar.gz | |
Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
Diffstat (limited to 'sql/udf_example.cc')
| -rw-r--r-- | sql/udf_example.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/udf_example.cc b/sql/udf_example.cc index a5ec77f88e4..f5ff9fe67b5 100644 --- a/sql/udf_example.cc +++ b/sql/udf_example.cc @@ -271,7 +271,7 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result, * characters and converting to uppercase. *-------------------------------------------------------*/ - for ( n = ntrans + 1, n_end = ntrans + sizeof(ntrans)-2; + for (n = ntrans + 1, n_end = ntrans + sizeof(ntrans)-2; word != w_end && n < n_end; word++ ) if ( isalpha ( *word )) *n++ = toupper ( *word ); @@ -324,7 +324,7 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result, KSflag = 0; /* state flag for KS translation */ - for ( metaph_end = result + MAXMETAPH, n_start = n; + for (metaph_end = result + MAXMETAPH, n_start = n; n <= n_end && result < metaph_end; n++ ) { @@ -402,7 +402,7 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result, n[2] != 'G' ) ? (char)'J' : (char)'K'; else - if( n[1] == 'H' && + if ( n[1] == 'H' && !NOGHTOF( *( n - 3 )) && *( n - 4 ) != 'H') *result++ = 'F'; @@ -440,7 +440,7 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result, case 'T': /* TIO, TIA = X ("sh" sound) */ /* TH = 0, ("th" sound ) */ - if( *( n + 1 ) == 'I' && ( n[2] == 'O' + if ( *( n + 1 ) == 'I' && ( n[2] == 'O' || n[2] == 'A') ) *result++ = 'X'; else |