Skip to content

Commit 709897c

Browse files
committed
Remove unused tsrm_strtok_r() function
There is also a php_strtok_r() function, which is actually used, but nothing uses the tsrm_strtok_r() variant...
1 parent 94d37a5 commit 709897c

File tree

5 files changed

+2
-78
lines changed

5 files changed

+2
-78
lines changed

TSRM/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// vim:ft=javascript
22

3-
ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
3+
ADD_SOURCES("TSRM", "TSRM.c tsrm_win32.c");
44
ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");

TSRM/tsrm_strtok_r.c

Lines changed: 0 additions & 63 deletions
This file was deleted.

TSRM/tsrm_strtok_r.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ PHP_SUBST(install_binary_targets)
15211521

15221522
PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
15231523

1524-
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
1524+
PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
15251525

15261526
PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c \
15271527
fopen_wrappers.c alloca.c php_scandir.c \

ext/phar/phar_internal.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
#include "ext/standard/sha1.h"
5050
#include "ext/standard/php_var.h"
5151
#include "ext/standard/php_versioning.h"
52-
#ifndef PHP_WIN32
53-
#include "TSRM/tsrm_strtok_r.h"
54-
#endif
5552
#include "Zend/zend_virtual_cwd.h"
5653
#include "ext/spl/spl_array.h"
5754
#include "ext/spl/spl_directory.h"
@@ -477,8 +474,6 @@ extern zend_string *(*phar_save_resolve_path)(const char *filename, size_t filen
477474
BEGIN_EXTERN_C()
478475

479476
#ifdef PHP_WIN32
480-
char *tsrm_strtok_r(char *s, const char *delim, char **last);
481-
482477
static inline void phar_unixify_path_separators(char *path, size_t path_len)
483478
{
484479
char *s;

0 commit comments

Comments
 (0)