iliaa Wed Dec 10 16:23:36 2003 EDT
Modified files:
/php-src/ext/exif exif.c
/php-src/ext/standard ftp_fopen_wrapper.c string.c php_string.h
Log:
Fixed ZTS build.
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.158 php-src/ext/exif/exif.c:1.159
--- php-src/ext/exif/exif.c:1.158 Mon Sep 22 19:27:51 2003
+++ php-src/ext/exif/exif.c Wed Dec 10 16:23:33 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.158 2003/09/22 23:27:51 iliaa Exp $ */
+/* $Id: exif.c,v 1.159 2003/12/10 21:23:33 iliaa Exp $ */
/* ToDos
*
@@ -111,7 +111,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.158 2003/09/22 23:27:51 iliaa Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.159 2003/12/10 21:23:33 iliaa Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3712,7 +3712,7 @@
return FALSE;
}
- php_basename(FileName, strlen(FileName), NULL, 0, &(ImageInfo->FileName),
NULL);
+ php_basename(FileName, strlen(FileName), NULL, 0, &(ImageInfo->FileName), NULL
TSRMLS_CC);
ImageInfo->read_thumbnail = read_thumbnail;
ImageInfo->read_all = read_all;
ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN;
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.67
php-src/ext/standard/ftp_fopen_wrapper.c:1.68
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.67 Wed Dec 10 02:15:28 2003
+++ php-src/ext/standard/ftp_fopen_wrapper.c Wed Dec 10 16:23:34 2003
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.67 2003/12/10 07:15:28 moriyoshi Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.68 2003/12/10 21:23:34 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -576,7 +576,7 @@
return 0;
}
- php_basename(ent->d_name, tmp_len, NULL, 0, &basename, &basename_len);
+ php_basename(ent->d_name, tmp_len, NULL, 0, &basename, &basename_len
TSRMLS_CC);
if (!basename) {
return 0;
}
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.406 php-src/ext/standard/string.c:1.407
--- php-src/ext/standard/string.c:1.406 Wed Dec 10 02:15:28 2003
+++ php-src/ext/standard/string.c Wed Dec 10 16:23:35 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.406 2003/12/10 07:15:28 moriyoshi Exp $ */
+/* $Id: string.c,v 1.407 2003/12/10 21:23:35 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1068,7 +1068,7 @@
/* {{{ php_basename
*/
-PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char
**p_ret, size_t *p_len)
+PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char
**p_ret, size_t *p_len TSRMLS_DC)
{
char *ret = NULL, *c, *comp, *cend;
size_t inc_len, cnt;
@@ -1146,7 +1146,7 @@
return;
}
- php_basename(string, string_len, suffix, suffix_len, &ret, &ret_len);
+ php_basename(string, string_len, suffix, suffix_len, &ret, &ret_len TSRMLS_CC);
RETURN_STRINGL(ret, (int)ret_len, 0);
}
/* }}} */
@@ -1265,7 +1265,7 @@
}
if ((opt & PHP_PATHINFO_BASENAME) == PHP_PATHINFO_BASENAME) {
- php_basename(path, path_len, NULL, 0, &ret, &ret_len);
+ php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC);
add_assoc_stringl(tmp, "basename", ret, ret_len, 0);
}
@@ -1276,7 +1276,7 @@
/* Have we alrady looked up the basename? */
if (!have_basename) {
- php_basename(path, path_len, NULL, 0, &ret, &ret_len);
+ php_basename(path, path_len, NULL, 0, &ret, &ret_len
TSRMLS_CC);
}
p = strrchr(ret, '.');
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.82 php-src/ext/standard/php_string.h:1.83
--- php-src/ext/standard/php_string.h:1.82 Wed Dec 10 02:15:28 2003
+++ php-src/ext/standard/php_string.h Wed Dec 10 16:23:35 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.82 2003/12/10 07:15:28 moriyoshi Exp $ */
+/* $Id: php_string.h,v 1.83 2003/12/10 21:23:35 iliaa Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -122,7 +122,7 @@
PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int freeit, char
*what, int wlength TSRMLS_DC);
PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
PHPAPI void php_stripcslashes(char *str, int *len);
-PHPAPI void php_basename(char *str, size_t len , char *suffix, size_t sufflen, char
**p_ret, size_t *p_len);
+PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char
**p_ret, size_t *p_len TSRMLS_DC);
PHPAPI size_t php_dirname(char *str, size_t len);
PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t
t_len);
PHPAPI char *php_str_to_str_ex(char *haystack, int length, char *needle,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
