cvs: php4 /ext/standard string.c

andrei Mon Sep 11 06:55:00 2000 EDT Modified files: /php4/ext/standard string.c Log: (PHP pathinfo) Fixed more typos. Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.149 php4/ext/standard/string.c:1.150 --- php4/ext/standard/string.c:1.149 Mon Sep 11 06:52:22 2000 +++ php4/ext/standard/string.c Mon Sep 11 06:54:59 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.149 2000/09/11 13:52:22 andrei Exp $ */ +/* $Id: string.c,v 1.150 2000/09/11 13:54:59 andrei Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -741,7 +741,7 @@ if (argc > 1) { convert_to_long_ex(uopt); opt = Z_LVAL_PP(uopt); - if (opt < PHP_PATHINFO_BASENAME || opt > PHP_PATHINFO_EXTENSION) { + if (opt < PHP_PATHINFO_DIRNAME || opt > PHP_PATHINFO_EXTENSION) { php_error(E_WARNING, "Invalid option in call to %s()", get_active_function_name()); return; @@ -751,7 +751,7 @@ MAKE_STD_ZVAL(tmp); array_init(tmp); - if (opt == PHP_PATHINFO_BASENAME || argc < 2) { + if (opt == PHP_PATHINFO_DIRNAME || argc < 2) { ret = estrndup(Z_STRVAL_PP(path), len); php_dirname(ret, len); if (*ret) @@ -759,7 +759,7 @@ efree(ret); } - if (opt == PHP_PATHINFO_DIRNAME || argc < 2) { + if (opt == PHP_PATHINFO_BASENAME || argc < 2) { ret = php_basename(Z_STRVAL_PP(path), len); add_assoc_string(tmp, "basename", ret, 0); }