diff -r 173fac22b018 svn.c
--- a/svn.c Tue Dec 29 11:00:59 2020 +0100
+++ b/svn.c Tue Dec 29 11:04:59 2020 +0100
@@ -54,7 +54,7 @@
do { \
if (init_svn_client(TSRMLS_C)) RETURN_FALSE; \
} while (0)
-
+
static void php_svn_get_version(char *buf, int buflen);
/* True global resources - no need for thread safety here */
@@ -293,7 +293,7 @@
#include "ext/standard/php_smart_string.h"
-static void php_svn_handle_error(svn_error_t *error TSRMLS_DC)
+static void php_svn_handle_error(svn_error_t *error)
{
svn_error_t *itr = error;
smart_string s = {0,0,0};
@@ -321,7 +321,7 @@
smart_string_appendl(&s, "\n", 1);
smart_string_0(&s);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", s.c);
+ php_error_docref(NULL, E_WARNING, "%s", s.c);
smart_string_free(&s);
}
@@ -372,7 +372,7 @@
SVN_G(pool) = svn_pool_create(NULL);
if ((err = svn_client_create_context (&SVN_G(ctx), SVN_G(pool)))) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
svn_pool_destroy(SVN_G(pool));
SVN_G(pool) = NULL;
return 1;
@@ -383,7 +383,7 @@
/* Should possible consider a notice here */
svn_error_clear(err);
} else {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
svn_pool_destroy(SVN_G(pool));
SVN_G(pool) = NULL;
return 1;
@@ -435,7 +435,7 @@
long keylen;
const char *value;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &keylen)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &key, &keylen)) {
return;
}
@@ -457,11 +457,11 @@
zval *value;
long keylen;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &key, &keylen, &value)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &key, &keylen, &value)) {
return;
}
PHP_SVN_INIT_CLIENT();
-
+
if (strcmp(key, SVN_AUTH_PARAM_DEFAULT_PASSWORD) == 0) {
svn_auth_set_parameter(SVN_G(ctx)->auth_baton, SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, "");
}
@@ -486,8 +486,8 @@
long config_path_len;
apr_pool_t *subpool;
svn_error_t *err;
-
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &config_path, &config_path_len)) {
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &config_path, &config_path_len)) {
return;
}
@@ -501,7 +501,7 @@
if (config_path) {
err = svn_utf_cstring_to_utf8 (&utf8_path, config_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -535,7 +535,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssb",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ssb",
&path, &pathlen, &url, &urllen, &nonrecursive)) {
RETURN_FALSE;
}
@@ -549,7 +549,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -559,7 +559,7 @@
err = svn_client_import(&commit_info_p, path, url, nonrecursive,
SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error (err TSRMLS_CC);
+ php_svn_handle_error (err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -584,27 +584,27 @@
/* Print something useful when old APR is used like that of Apache 2.0.x */
apr_version(&apv);
if (apv.major < APR_MAJOR_VERSION) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "libsvn was compiled against a newer version of APR than was loaded");
+ php_error_docref(NULL, E_WARNING, "libsvn was compiled against a newer version of APR than was loaded");
}
ZEND_INIT_MODULE_GLOBALS(svn, php_svn_init_globals, NULL);
INIT_CLASS_ENTRY(ce, "Svn", svn_methods);
- ce_Svn = zend_register_internal_class(&ce TSRMLS_CC);
+ ce_Svn = zend_register_internal_class(&ce);
INIT_CLASS_ENTRY(ce, "SvnWc", NULL);
- ce_SvnWc = zend_register_internal_class(&ce TSRMLS_CC);
+ ce_SvnWc = zend_register_internal_class(&ce);
INIT_CLASS_ENTRY(ce, "SvnWcSchedule", NULL);
- ce_SvnWcSchedule = zend_register_internal_class(&ce TSRMLS_CC);
+ ce_SvnWcSchedule = zend_register_internal_class(&ce);
INIT_CLASS_ENTRY(ce, "SvnNode", NULL);
- ce_SvnNode = zend_register_internal_class(&ce TSRMLS_CC);
+ ce_SvnNode = zend_register_internal_class(&ce);
#define CLASS_CONST_LONG(class_name, const_name, value) \
zend_declare_class_constant_long(ce_ ## class_name, const_name, \
- sizeof(const_name)-1, (long)value TSRMLS_CC);
+ sizeof(const_name)-1, (long)value);
CLASS_CONST_LONG(Svn, "NON_RECURSIVE", SVN_NON_RECURSIVE);
CLASS_CONST_LONG(Svn, "DISCOVER_CHANGED_PATHS", SVN_DISCOVER_CHANGED_PATHS);
@@ -788,7 +788,7 @@
revision.value.number = svn_opt_revision_unspecified;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|lll",
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|lll",
&repos_url, &repos_url_len, &target_path, &target_path_len, &revision.value.number, &flags, &depth) == FAILURE) {
return;
}
@@ -801,13 +801,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_repos_url, repos_url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_target_path, target_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -819,7 +819,7 @@
err = svn_opt_parse_path(&peg_revision, &true_path, can_repos_url, subpool);
if (err) {
- php_svn_handle_error (err TSRMLS_CC);
+ php_svn_handle_error (err);
RETVAL_FALSE;
goto cleanup;
}
@@ -853,7 +853,7 @@
#endif
if (err) {
- php_svn_handle_error (err TSRMLS_CC);
+ php_svn_handle_error (err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -882,7 +882,7 @@
revision.value.number = svn_opt_revision_unspecified;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l",
&url, &url_len, &revision.value.number) == FAILURE) {
return;
}
@@ -899,19 +899,19 @@
buf = svn_stringbuf_create("", subpool);
if (!buf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to allocate stringbuf");
+ php_error_docref(NULL, E_WARNING, "failed to allocate stringbuf");
goto cleanup;
}
out = svn_stream_from_stringbuf(buf, subpool);
if (!out) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create svn stream");
+ php_error_docref(NULL, E_WARNING, "failed to create svn stream");
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
goto cleanup;
}
@@ -919,14 +919,14 @@
err = svn_opt_parse_path(&peg_revision, &true_path, url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
goto cleanup;
}
err = svn_client_cat2(out, true_path, &peg_revision, &revision, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
goto cleanup;
}
@@ -935,7 +935,7 @@
err = svn_stream_read(out, retdata, &size);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
goto cleanup;
}
@@ -955,7 +955,7 @@
Bucket *s = *((Bucket **) b);
int diff;
diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key);
- if (diff)
+ if (diff)
return diff;
return strncmp(ZSTR_VAL(f->key), ZSTR_VAL(s->key), ZSTR_LEN(f->key));
}
@@ -977,7 +977,7 @@
const char *true_path;
apr_hash_index_t *hi;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbb",
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|lbb",
&repos_url, &repos_url_len, &revision.value.number, &recurse, &peg) == FAILURE) {
return;
}
@@ -989,18 +989,18 @@
err = svn_utf_cstring_to_utf8 (&utf8_repos_url, repos_url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
repos_url = svn_path_canonicalize(utf8_repos_url, subpool);
- revision.kind = php_svn_get_revision_kind(revision);
+ revision.kind = php_svn_get_revision_kind(revision);
err = svn_opt_parse_path(&peg_revision, &true_path, repos_url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1013,7 +1013,7 @@
SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1029,7 +1029,7 @@
char timestr[20];
const char *utf8_timestr;
zval row;
-
+
/*
svn_utf_cstring_to_utf8 (&utf8_entryname, apr_hash_this_key(hi), subpool);
@@ -1062,7 +1062,7 @@
/* we need it in UTF-8. */
err = svn_utf_cstring_to_utf8 (&utf8_timestr, timestr, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1093,7 +1093,7 @@
Bucket *s = (Bucket *)b;
int diff;
diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key);
- if (diff)
+ if (diff)
return diff;
return strncmp(ZSTR_VAL(f->key), ZSTR_VAL(s->key), ZSTR_LEN(f->key));
}
@@ -1190,7 +1190,7 @@
start_revision.value.number = svn_opt_revision_unspecified;
end_revision.value.number = svn_opt_revision_unspecified;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|llll",
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|llll",
&url, &url_len,
&start_revision.value.number, &end_revision.value.number,
&limit, &flags) == FAILURE) {
@@ -1204,7 +1204,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1227,7 +1227,7 @@
err = svn_opt_parse_path(&peg_revision, &true_path, url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1251,7 +1251,7 @@
(void *) &baton,
SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1261,7 +1261,7 @@
}
/* }}} */
-static size_t php_apr_file_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
+static size_t php_apr_file_write(php_stream *stream, const char *buf, size_t count)
{
apr_file_t *thefile = (apr_file_t*)stream->abstract;
apr_size_t nbytes = (apr_size_t)count;
@@ -1271,7 +1271,7 @@
return (size_t)nbytes;
}
-static size_t php_apr_file_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
+static size_t php_apr_file_read(php_stream *stream, char *buf, size_t count)
{
apr_file_t *thefile = (apr_file_t*)stream->abstract;
apr_size_t nbytes = (apr_size_t)count;
@@ -1283,7 +1283,7 @@
return (size_t)nbytes;
}
-static int php_apr_file_close(php_stream *stream, int close_handle TSRMLS_DC)
+static int php_apr_file_close(php_stream *stream, int close_handle)
{
if (close_handle) {
apr_file_close((apr_file_t*)stream->abstract);
@@ -1291,13 +1291,13 @@
return 0;
}
-static int php_apr_file_flush(php_stream *stream TSRMLS_DC)
+static int php_apr_file_flush(php_stream *stream)
{
apr_file_flush((apr_file_t*)stream->abstract);
return 0;
}
-static int php_apr_file_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset TSRMLS_DC)
+static int php_apr_file_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset)
{
apr_file_t *thefile = (apr_file_t*)stream->abstract;
apr_off_t off = (apr_off_t)offset;
@@ -1340,7 +1340,7 @@
svn_opt_revision_t revision1, revision2;
zend_bool ignore_content_type = 0;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl!sl!",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sl!sl!",
&path1, &path1len, &rev1,
&path2, &path2len, &rev2)) {
return;
@@ -1384,7 +1384,7 @@
if (err) {
apr_file_close(errfile);
apr_file_close(outfile);
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
goto cleanup;
}
@@ -1392,7 +1392,7 @@
if (err) {
apr_file_close(errfile);
apr_file_close(outfile);
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
goto cleanup;
}
@@ -1413,7 +1413,7 @@
if (err) {
apr_file_close(errfile);
apr_file_close(outfile);
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
} else {
zval t;
php_stream *stm = NULL;
@@ -1452,7 +1452,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &workingdir, &workingdir_len)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &workingdir, &workingdir_len)) {
RETURN_FALSE;
}
@@ -1464,7 +1464,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_workingdir, workingdir, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1474,7 +1474,7 @@
err = svn_client_cleanup(workingdir, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
} else {
@@ -1498,7 +1498,7 @@
apr_array_header_t *targets;
apr_pool_t *subpool;
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &path, &pathlen, &recursive) ) {
+ if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|b", &path, &pathlen, &recursive) ) {
RETURN_FALSE;
}
@@ -1510,7 +1510,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1526,7 +1526,7 @@
subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
} else {
@@ -1549,7 +1549,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &path, &pathlen, &recursive) ) {
+ if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|b", &path, &pathlen, &recursive) ) {
RETURN_FALSE;
}
@@ -1562,7 +1562,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1576,7 +1576,7 @@
subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
} else {
@@ -1589,7 +1589,7 @@
}
/* }}} */
-static int replicate_hash(zval *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *key)
+static int replicate_hash(zval *pDest, int num_args, va_list args, zend_hash_key *key)
{
apr_hash_t *hash = va_arg(args, apr_hash_t*);
@@ -1603,7 +1603,7 @@
return ZEND_HASH_APPLY_KEEP;
}
-static apr_hash_t *replicate_zend_hash_to_apr_hash(zval *arr, apr_pool_t *pool TSRMLS_DC)
+static apr_hash_t *replicate_zend_hash_to_apr_hash(zval *arr, apr_pool_t *pool)
{
apr_hash_t *hash;
@@ -1611,7 +1611,7 @@
hash = apr_hash_make(pool);
- zend_hash_apply_with_arguments(Z_ARRVAL_P(arr) TSRMLS_CC, replicate_hash, 1, hash);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(arr), replicate_hash, 1, hash);
return hash;
}
@@ -1629,7 +1629,7 @@
long propnamelen;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rls",
&zfs, &revnum, &propname, &propnamelen)) {
return;
}
@@ -1643,7 +1643,7 @@
err = svn_fs_revision_prop(&str, fs->fs, revnum, propname, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (!str) {
/* the property is not found. return an empty string */
@@ -1665,7 +1665,7 @@
svn_error_t *err;
svn_revnum_t revnum;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r",
&zfs)) {
return;
}
@@ -1675,7 +1675,7 @@
err = svn_fs_youngest_rev(&revnum, fs->fs, fs->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETURN_FALSE;
}
@@ -1696,7 +1696,7 @@
svn_error_t *err;
struct php_svn_fs_root *resource;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rl",
&zfs, &revnum)) {
return;
}
@@ -1705,7 +1705,7 @@
err = svn_fs_revision_root(&root, fs->fs, revnum, fs->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETURN_FALSE;
}
@@ -1718,7 +1718,7 @@
}
/* }}} */
-static size_t php_svn_stream_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
+static size_t php_svn_stream_write(php_stream *stream, const char *buf, size_t count)
{
svn_stream_t *thefile = (svn_stream_t*)stream->abstract;
apr_size_t nbytes = (apr_size_t)count;
@@ -1728,7 +1728,7 @@
return (size_t)nbytes;
}
-static size_t php_svn_stream_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
+static size_t php_svn_stream_read(php_stream *stream, char *buf, size_t count)
{
svn_stream_t *thefile = (svn_stream_t*)stream->abstract;
apr_size_t nbytes = (apr_size_t)count;
@@ -1740,7 +1740,7 @@
return (size_t)nbytes;
}
-static int php_svn_stream_close(php_stream *stream, int close_handle TSRMLS_DC)
+static int php_svn_stream_close(php_stream *stream, int close_handle)
{
if (close_handle) {
svn_stream_close((svn_stream_t*)stream->abstract);
@@ -1748,7 +1748,7 @@
return 0;
}
-static int php_svn_stream_flush(php_stream *stream TSRMLS_DC)
+static int php_svn_stream_flush(php_stream *stream)
{
return 0;
}
@@ -1778,7 +1778,7 @@
svn_stream_t *svnstm;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zfsroot, &path, &pathlen)) {
return;
}
@@ -1792,7 +1792,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1802,7 +1802,7 @@
err = svn_fs_file_contents(&svnstm, fsroot->root, path, SVN_G(pool));
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
php_stream *stm;
@@ -1828,7 +1828,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zfsroot, &path, &pathlen)) {
return;
}
@@ -1842,7 +1842,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1852,7 +1852,7 @@
err = svn_fs_file_length(&len, fsroot->root, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
/* TODO: 64 bit */
@@ -1878,7 +1878,7 @@
apr_pool_t *subpool;
svn_string_t *val;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rss",
&zfsroot, &path, &pathlen, &propname, &propnamelen)) {
return;
}
@@ -1892,7 +1892,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1902,7 +1902,7 @@
err = svn_fs_node_prop(&val, fsroot->root, path, propname, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
if (val != NULL && val->data != NULL) {
@@ -1931,7 +1931,7 @@
apr_pool_t *subpool;
svn_revnum_t rev;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zfsroot, &path, &pathlen)) {
return;
}
@@ -1945,7 +1945,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -1955,7 +1955,7 @@
err = svn_fs_node_created_rev(&rev, fsroot->root, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_LONG(rev);
@@ -1984,7 +1984,7 @@
svn_fs_dirent_t *ent;
} pun;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zfsroot, &path, &pathlen)) {
return;
}
@@ -1998,7 +1998,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2008,7 +2008,7 @@
err = svn_fs_dir_entries(&hash, fsroot->root, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
array_init(return_value);
@@ -2037,7 +2037,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zfsroot, &path, &pathlen)) {
return;
}
@@ -2051,7 +2051,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2061,7 +2061,7 @@
err = svn_fs_check_path(&kind, fsroot->root, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_LONG(kind);
@@ -2081,7 +2081,7 @@
zval *zrepos;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r",
&zrepos)) {
return;
}
@@ -2110,7 +2110,7 @@
struct php_svn_repos *resource = NULL;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s",
&path, &pathlen)) {
return;
}
@@ -2123,7 +2123,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
svn_pool_destroy(subpool);
RETURN_FALSE;
}
@@ -2133,7 +2133,7 @@
err = svn_repos_open(&repos, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
}
if (repos) {
@@ -2203,7 +2203,7 @@
svn_opt_revision_t peg_revision, revision;
const char *true_path;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bl",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|bl",
&path, &pathlen, &recurse, &revnum)) {
return;
}
@@ -2217,7 +2217,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2225,14 +2225,14 @@
path = svn_path_canonicalize(utf8_path, subpool);
revision.value.number = revnum;
- revision.kind = !svn_path_is_url(path) && revnum == SVN_REVISION_UNSPECIFIED ?
- svn_opt_revision_unspecified : php_svn_get_revision_kind(revision);
+ revision.kind = !svn_path_is_url(path) && revnum == SVN_REVISION_UNSPECIFIED ?
+ svn_opt_revision_unspecified : php_svn_get_revision_kind(revision);
if (svn_path_is_url(path))
{
err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2245,7 +2245,7 @@
array_init(return_value);
err = svn_client_info(true_path, &peg_revision, &revision, info_func, return_value, recurse, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
}
@@ -2270,7 +2270,7 @@
svn_error_t *err;
svn_opt_revision_t revision, peg_revision;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bl",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bl",
&from, &fromlen, &to, &tolen, &working_copy, &revision_no )) {
return;
}
@@ -2284,14 +2284,14 @@
err = svn_utf_cstring_to_utf8 (&utf8_from_path, from, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_to_path, to, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2303,7 +2303,7 @@
revision.kind = svn_opt_revision_working;
} else {
revision.value.number = revision_no;
- revision.kind = php_svn_get_revision_kind(revision);
+ revision.kind = php_svn_get_revision_kind(revision);
}
peg_revision.kind = svn_opt_revision_unspecified;
@@ -2311,7 +2311,7 @@
err = svn_client_export3(NULL, from, to, &peg_revision, &revision, TRUE, FALSE, TRUE, NULL, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -2335,7 +2335,7 @@
svn_error_t *err;
svn_opt_revision_t revision;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ss|b",
&path, &pathlen, &url, &urllen, &working_copy)) {
return;
}
@@ -2349,13 +2349,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2372,7 +2372,7 @@
err = svn_client_switch(NULL, path, url, &revision, TRUE, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -2399,7 +2399,7 @@
svn_commit_info_t *info = NULL;
svn_opt_revision_t revision;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|bl",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sss|bl",
&log, &loglen, &src_path, &src_pathlen, &dst_path, &dst_pathlen,
&working_copy, &revnum)) {
return;
@@ -2414,13 +2414,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_src_path, src_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_dst_path, dst_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2442,7 +2442,7 @@
SVN_G(ctx)->log_msg_baton = NULL;
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (info) {
array_init(return_value);
@@ -2459,7 +2459,7 @@
add_next_index_null(return_value);
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "commit didn't return any info");
+ php_error_docref(NULL, E_WARNING, "commit didn't return any info");
RETVAL_FALSE;
}
@@ -2523,7 +2523,7 @@
apr_pool_t *subpool;
const char *true_path;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &repos_url, &repos_url_len, &revision) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &repos_url, &repos_url_len, &revision) == FAILURE) {
RETURN_FALSE;
}
@@ -2535,16 +2535,16 @@
err = svn_utf_cstring_to_utf8 (&utf8_repos_url, repos_url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
repos_url = svn_path_canonicalize(utf8_repos_url, subpool);
-
+
start_revision.kind = svn_opt_revision_number;
start_revision.value.number = 0;
-
+
if (revision == -1) {
end_revision.kind = svn_opt_revision_head;
} else {
@@ -2554,7 +2554,7 @@
err = svn_opt_parse_path(&peg_revision, &true_path, repos_url, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2572,7 +2572,7 @@
subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2594,8 +2594,8 @@
svn_error_t *err;
svn_commit_info_t *info = NULL;
apr_array_header_t *targets;
-
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bs",
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|bs",
&path, &pathlen, &force, &logmsg, &logmsg_len)) {
return;
}
@@ -2608,20 +2608,20 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
targets = apr_array_make (subpool, 1, sizeof(char *));
APR_ARRAY_PUSH(targets, const char *) = svn_path_canonicalize(utf8_path, subpool);
-
- SVN_G(ctx)->log_msg_baton = (char *)logmsg;
+
+ SVN_G(ctx)->log_msg_baton = (char *)logmsg;
err = svn_client_delete2(&info, targets, force, SVN_G(ctx), subpool);
- SVN_G(ctx)->log_msg_baton = NULL;
+ SVN_G(ctx)->log_msg_baton = NULL;
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (info) {
array_init(return_value);
@@ -2658,7 +2658,7 @@
svn_commit_info_t *info = NULL;
apr_array_header_t *targets;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|s",
&path, &pathlen, &log_message, &loglen)) {
return;
}
@@ -2672,7 +2672,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2692,7 +2692,7 @@
SVN_G(ctx)->log_msg_baton = NULL;
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2702,7 +2702,7 @@
RETVAL_TRUE;
goto cleanup;
}
-
+
if (!info) {
RETVAL_FALSE;
goto cleanup;
@@ -2739,7 +2739,7 @@
svn_error_t *err;
svn_commit_info_t *info = NULL;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ss|b",
&src_path, &src_pathlen, &dst_path, &dst_pathlen, &force)) {
return;
}
@@ -2753,13 +2753,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_src_path, src_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_dst_path, dst_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -2770,7 +2770,7 @@
err = svn_client_move3(&info, src_path, dst_path, force, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (info) {
array_init(return_value);
@@ -2810,8 +2810,8 @@
int i = 0;
const char *true_path;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bl",
- &path, &pathlen, &recurse, &revision.value.number)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|bl",
+ &path, &pathlen, &recurse, &revision.value.number)) {
return;
}
@@ -2822,28 +2822,28 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
path = svn_path_canonicalize(utf8_path, subpool);
-
- revision.kind = php_svn_get_revision_kind(revision);
+
+ revision.kind = php_svn_get_revision_kind(revision);
err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
-
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
+
err = svn_client_proplist2(&props, true_path, &peg_revision, &revision, recurse, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
array_init(return_value);
@@ -2892,8 +2892,8 @@
apr_hash_index_t *hi;
const char *true_path;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bl",
- &path, &pathlen, &propname, &propnamelen, &recurse, &revision.value.number)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bl",
+ &path, &pathlen, &propname, &propnamelen, &recurse, &revision.value.number)) {
return;
}
@@ -2903,28 +2903,28 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
path = svn_path_canonicalize(utf8_path, subpool);
-
- revision.kind = php_svn_get_revision_kind(revision);
+
+ revision.kind = php_svn_get_revision_kind(revision);
err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
-
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
+
err = svn_client_propget2(&props, propname, true_path, &peg_revision, &revision, recurse, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
@@ -2966,8 +2966,8 @@
apr_hash_index_t *hi;
const char *true_path;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|bbl",
- &path, &pathlen, &propname, &propnamelen, &propval, &propvallen, &recurse, &skip_checks, &revision.value.number)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sss|bbl",
+ &path, &pathlen, &propname, &propnamelen, &propval, &propvallen, &recurse, &skip_checks, &revision.value.number)) {
return;
}
@@ -2977,28 +2977,28 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
path = svn_path_canonicalize(utf8_path, subpool);
-
- revision.kind = php_svn_get_revision_kind(revision);
+
+ revision.kind = php_svn_get_revision_kind(revision);
err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
-
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
+
err = svn_client_propset2(propname, svn_string_ncreate(propval, propvallen, subpool), true_path, recurse, skip_checks, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3024,8 +3024,8 @@
apr_hash_index_t *hi;
const char *true_path;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bbl",
- &path, &pathlen, &propname, &propnamelen, &recurse, &skip_checks, &revision.value.number)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bbl",
+ &path, &pathlen, &propname, &propnamelen, &recurse, &skip_checks, &revision.value.number)) {
return;
}
@@ -3035,28 +3035,28 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
path = svn_path_canonicalize(utf8_path, subpool);
-
- revision.kind = php_svn_get_revision_kind(revision);
+
+ revision.kind = php_svn_get_revision_kind(revision);
err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
-
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
+
err = svn_client_propset2(propname, NULL, true_path, recurse, skip_checks, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3082,8 +3082,8 @@
svn_revnum_t result_rev;
svn_string_t* pval = NULL;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sls",
- &url, &urllen, &revision.value.number, &propname, &propnamelen)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sls",
+ &url, &urllen, &revision.value.number, &propname, &propnamelen)) {
return;
}
@@ -3093,17 +3093,17 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
err = svn_utf_cstring_to_utf8 (&utf8_propname, propname, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
}
url = svn_path_canonicalize(utf8_url, subpool);
@@ -3114,7 +3114,7 @@
utf8_propname, &pval,
url, &revision, &result_rev, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
} else if (!pval) {
@@ -3142,8 +3142,8 @@
svn_revnum_t result_rev;
zend_bool force = 0;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slss|b",
- &url, &urllen, &revision.value.number, &propname, &propnamelen, &propval, &propvallen, &force)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "slss|b",
+ &url, &urllen, &revision.value.number, &propname, &propnamelen, &propval, &propvallen, &force)) {
return;
}
@@ -3153,17 +3153,17 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
err = svn_utf_cstring_to_utf8 (&utf8_propname, propname, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
}
url = svn_path_canonicalize(utf8_url, subpool);
@@ -3171,10 +3171,10 @@
revision.kind = php_svn_get_revision_kind(revision);
err = svn_client_revprop_set (
- utf8_propname, svn_string_ncreate(propval, propvallen, subpool),
+ utf8_propname, svn_string_ncreate(propval, propvallen, subpool),
url, &revision, &result_rev, force, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
} else {
@@ -3199,8 +3199,8 @@
svn_string_t* pval = NULL;
svn_revnum_t result_rev;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sls",
- &url, &urllen, &revision.value.number, &propname, &propnamelen)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sls",
+ &url, &urllen, &revision.value.number, &propname, &propnamelen)) {
return;
}
@@ -3210,17 +3210,17 @@
RETURN_FALSE;
}
- err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool);
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
err = svn_utf_cstring_to_utf8 (&utf8_propname, propname, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
}
url = svn_path_canonicalize(utf8_url, subpool);
@@ -3231,7 +3231,7 @@
utf8_propname, NULL,
url, &revision, &result_rev, FALSE, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
} else {
@@ -3260,33 +3260,33 @@
struct php_svn_repos *resource = NULL;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a!a!",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|a!a!",
&path, &pathlen, &config, &fsconfig)) {
return;
}
PHP_SVN_INIT_CLIENT();
subpool = svn_pool_create(SVN_G(pool));
- if (!subpool) {
+ if (!subpool) {
RETURN_FALSE;
}
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
svn_pool_destroy(subpool);
RETURN_FALSE;
}
path = svn_path_canonicalize(utf8_path, subpool);
- config_hash = replicate_zend_hash_to_apr_hash(config, subpool TSRMLS_CC);
- fsconfig_hash = replicate_zend_hash_to_apr_hash(fsconfig, subpool TSRMLS_CC);
+ config_hash = replicate_zend_hash_to_apr_hash(config, subpool);
+ fsconfig_hash = replicate_zend_hash_to_apr_hash(fsconfig, subpool);
err = svn_repos_create(&repos, path, NULL, NULL, config_hash, fsconfig_hash, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
}
if (repos) {
@@ -3312,7 +3312,7 @@
apr_pool_t *subpool;
svn_error_t *err;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s",
&path, &pathlen)) {
return;
}
@@ -3324,17 +3324,17 @@
}
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
path = svn_path_canonicalize(utf8_path, subpool);
err = svn_repos_recover2(path, 0, NULL, NULL, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3357,7 +3357,7 @@
apr_pool_t *subpool;
svn_error_t *err;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssb",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ssb",
&src_path, &src_path_len, &dst_path, &dst_path_len, &cleanlogs)) {
return;
}
@@ -3369,17 +3369,17 @@
}
err = svn_utf_cstring_to_utf8 (&utf8_src_path, src_path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
err = svn_utf_cstring_to_utf8 (&utf8_dst_path, dst_path, subpool);
- if (err) {
- php_svn_handle_error(err TSRMLS_CC);
- RETVAL_FALSE;
- goto cleanup;
- }
+ if (err) {
+ php_svn_handle_error(err);
+ RETVAL_FALSE;
+ goto cleanup;
+ }
src_path = svn_path_canonicalize(utf8_src_path, subpool);
dst_path = svn_path_canonicalize(utf8_dst_path, subpool);
@@ -3387,7 +3387,7 @@
err = svn_repos_hotcopy(src_path, dst_path, cleanlogs, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3399,12 +3399,12 @@
}
/* }}} */
-static int replicate_array(zval *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *key)
+static int replicate_array(zval *pDest, int num_args, va_list args, zend_hash_key *key)
{
apr_pool_t *pool = (apr_pool_t*)va_arg(args, apr_pool_t*);
apr_array_header_t *arr = (apr_array_header_t*)va_arg(args, apr_array_header_t*);
- int type = Z_TYPE_P(pDest);
+ int type = Z_TYPE_P(pDest);
char * str = Z_STRVAL_P(pDest);
if (Z_TYPE_P(pDest) == IS_STRING) {
@@ -3417,13 +3417,13 @@
}
-static apr_array_header_t *replicate_zend_hash_to_apr_array(zval *arr, apr_pool_t *pool TSRMLS_DC)
+static apr_array_header_t *replicate_zend_hash_to_apr_array(zval *arr, apr_pool_t *pool)
{
apr_array_header_t *apr_arr = apr_array_make(pool, zend_hash_num_elements(Z_ARRVAL_P(arr)), sizeof(const char*));
if (!apr_arr) return NULL;
- zend_hash_apply_with_arguments(Z_ARRVAL_P(arr) TSRMLS_CC, replicate_array, 2, pool, apr_arr);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(arr), replicate_array, 2, pool, apr_arr);
return apr_arr;
}
@@ -3444,9 +3444,9 @@
apr_array_header_t *targets_array;
- if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "ss|b",
+ if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "ss|b",
&log, &loglen, &path, &pathlen, &recursive)) {
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|b",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sa|b",
&log, &loglen, &targets, &recursive)) {
return;
}
@@ -3463,7 +3463,7 @@
if (path) {
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3473,14 +3473,14 @@
APR_ARRAY_PUSH(targets_array, const char *) = path;
} else {
/* TODO: need to canonicalize the array */
- targets_array = replicate_zend_hash_to_apr_array(targets, subpool TSRMLS_CC);
+ targets_array = replicate_zend_hash_to_apr_array(targets, subpool);
}
err = svn_client_commit3(&info, targets_array, recursive, 1, SVN_G(ctx), subpool);
SVN_G(ctx)->log_msg_baton = NULL;
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (info) {
array_init(return_value);
@@ -3497,7 +3497,7 @@
add_next_index_null(return_value);
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "commit didn't return any info");
+ php_error_docref(NULL, E_WARNING, "commit didn't return any info");
RETVAL_FALSE;
}
@@ -3521,9 +3521,9 @@
zval *targets = NULL;
apr_array_header_t *targets_array;
- if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "ss|b",
+ if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "ss|b",
&comment, &comment_len, &path, &pathlen, &steal_lock)) {
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|b",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sa|b",
&comment, &comment_len, &targets, &steal_lock)) {
return;
}
@@ -3538,7 +3538,7 @@
if (path) {
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3548,13 +3548,13 @@
APR_ARRAY_PUSH(targets_array, const char *) = path;
} else {
/* TODO: need to canonicalize the array */
- targets_array = replicate_zend_hash_to_apr_array(targets, subpool TSRMLS_CC);
+ targets_array = replicate_zend_hash_to_apr_array(targets, subpool);
}
err = svn_client_lock(targets_array, comment, steal_lock, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3579,9 +3579,9 @@
zval *targets = NULL;
apr_array_header_t *targets_array;
- if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s|b",
+ if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "s|b",
&path, &pathlen, &break_lock)) {
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "a|b",
&targets, &break_lock)) {
return;
}
@@ -3596,7 +3596,7 @@
if (path) {
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3606,13 +3606,13 @@
APR_ARRAY_PUSH(targets_array, const char *) = path;
} else {
/* TODO: need to canonicalize the array */
- targets_array = replicate_zend_hash_to_apr_array(targets, subpool TSRMLS_CC);
+ targets_array = replicate_zend_hash_to_apr_array(targets, subpool);
}
err = svn_client_unlock(targets_array, break_lock, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3635,7 +3635,7 @@
apr_pool_t *subpool;
svn_error_t *err;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bb",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|bb",
&path, &pathlen, &recurse, &force)) {
return;
}
@@ -3648,7 +3648,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3658,7 +3658,7 @@
err = svn_client_add2((const char*)path, recurse, force, SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -3742,7 +3742,7 @@
svn_revnum_t result_revision;
svn_opt_revision_t revision;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|l",
&path, &path_len, &flags)) {
return;
}
@@ -3755,7 +3755,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3779,7 +3779,7 @@
subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
}
@@ -3803,7 +3803,7 @@
svn_opt_revision_t rev;
long revno = -1;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lb",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|lb",
&path, &pathlen, &revno, &recurse)) {
return;
}
@@ -3817,7 +3817,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err)
{
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3826,12 +3826,12 @@
rev.value.number = revno;
rev.kind = php_svn_get_revision_kind (rev);
-
+
err = svn_client_update(&result_rev, path, &rev, recurse,
SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_LONG(result_rev);
@@ -3862,7 +3862,7 @@
long flags = 0;
long depth = svn_depth_infinity;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lll",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|lll",
&path, &pathlen, &revno, &flags, &depth)) {
return;
}
@@ -3876,7 +3876,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err)
{
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -3890,15 +3890,15 @@
rev.kind = php_svn_get_revision_kind (rev);
err = svn_client_update3(
- &result_revs, path_array, &rev,
- depth,
+ &result_revs, path_array, &rev,
+ depth,
FALSE, /* depth_is_sticky */
flags & SVN_IGNORE_EXTERNALS, /* ignore_externals */
FALSE, /* allow_unver_obstructions */
SVN_G(ctx), subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_LONG(APR_ARRAY_IDX(result_revs, 0, long));
@@ -3953,7 +3953,7 @@
svn_error_t *err;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlss",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rlss",
&zrepos, &rev, &author, &author_len, &log_msg, &log_msg_len)) {
return;
}
@@ -3968,7 +3968,7 @@
err = svn_repos_fs_begin_txn_for_commit(&txn_p, repos->repos, rev, author, log_msg, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
}
if (txn_p) {
@@ -3996,7 +3996,7 @@
svn_revnum_t new_rev;
svn_error_t *err;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r",
&ztxn)) {
RETURN_FALSE;
}
@@ -4006,7 +4006,7 @@
err = svn_repos_fs_commit_txn(&conflicts, txn->repos->repos, &new_rev, txn->txn, txn->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETURN_FALSE;
}
@@ -4025,7 +4025,7 @@
svn_error_t *err;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r",
&ztxn)) {
return;
}
@@ -4035,7 +4035,7 @@
err = svn_fs_txn_root(&root_p, txn->txn, txn->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETURN_FALSE;
}
@@ -4064,7 +4064,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zroot, &path, &path_len)) {
RETURN_FALSE;
}
@@ -4076,7 +4076,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4087,7 +4087,7 @@
err = svn_fs_make_file(root->root, path, root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -4109,7 +4109,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zroot, &path, &path_len)) {
RETURN_FALSE;
}
@@ -4121,7 +4121,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4132,7 +4132,7 @@
err = svn_fs_make_dir(root->root, path, root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -4157,7 +4157,7 @@
svn_stream_t *stream_p = NULL;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zroot, &path, &path_len)) {
RETURN_FALSE;
}
@@ -4169,7 +4169,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4180,7 +4180,7 @@
err = svn_fs_apply_text(&stream_p, root->root, path, NULL, root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4210,7 +4210,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rsrs",
&zfrom_root, &from_path, &from_path_len,
&zto_root, &to_path, &to_path_len)) {
RETURN_FALSE;
@@ -4223,13 +4223,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_from_path, from_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_to_path, to_path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4243,7 +4243,7 @@
err = svn_fs_copy(from_root->root, from_path, to_root->root, to_path, to_root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -4265,7 +4265,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zroot, &path, &path_len)) {
RETURN_FALSE;
}
@@ -4277,7 +4277,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4288,7 +4288,7 @@
err = svn_fs_delete(root->root, path, root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -4311,7 +4311,7 @@
svn_error_t *err;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rl",
&zfs, &rev)) {
return;
}
@@ -4321,7 +4321,7 @@
err = svn_fs_begin_txn2(&txn_p, fs->fs, rev, 0, SVN_G(pool));
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETURN_FALSE;
}
@@ -4351,7 +4351,7 @@
svn_boolean_t is_file;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zroot, &path, &path_len)) {
RETURN_FALSE;
}
@@ -4363,7 +4363,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4375,7 +4375,7 @@
err = svn_fs_is_file(&is_file, root->root, path, root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_BOOL(is_file);
@@ -4398,7 +4398,7 @@
svn_boolean_t is_dir;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zroot, &path, &path_len)) {
RETURN_FALSE;
}
@@ -4410,7 +4410,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4421,7 +4421,7 @@
err = svn_fs_is_dir(&is_dir, root->root, path, root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_BOOL(is_dir);
@@ -4445,7 +4445,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssz",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rssz",
&zroot, &path, &path_len, &name, &name_len, &value)) {
RETURN_FALSE;
}
@@ -4457,7 +4457,7 @@
err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4476,7 +4476,7 @@
root->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -4500,7 +4500,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rsrs",
&zroot1, &path1, &path1_len,
&zroot2, &path2, &path2_len)) {
RETURN_FALSE;
@@ -4513,13 +4513,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_path1, path1, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_path2, path2, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4534,7 +4534,7 @@
root2->root, path2, root1->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (changed == 1) {
RETVAL_TRUE;
@@ -4560,7 +4560,7 @@
svn_error_t *err;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rsrs",
&zroot1, &path1, &path1_len,
&zroot2, &path2, &path2_len)) {
RETURN_FALSE;
@@ -4573,13 +4573,13 @@
err = svn_utf_cstring_to_utf8 (&utf8_path1, path1, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
err = svn_utf_cstring_to_utf8 (&utf8_path2, path2, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
goto cleanup;
}
@@ -4594,7 +4594,7 @@
root2->root, path2, root1->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (changed == 1) {
RETVAL_TRUE;
@@ -4615,7 +4615,7 @@
struct php_svn_repos_fs_txn *txn;
svn_error_t *err;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r",
&ztxn)) {
return;
}
@@ -4625,7 +4625,7 @@
err = svn_fs_abort_txn(txn->txn, txn->repos->pool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETURN_FALSE;
} else {
RETURN_TRUE;
@@ -4647,7 +4647,7 @@
apr_pool_t *subpool;
zend_resource *ret_res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&zfs, &name, &name_len)) {
return;
}
@@ -4661,7 +4661,7 @@
err = svn_fs_open_txn (&txn, fs->fs, name, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (txn) {
struct php_svn_repos_fs_txn *new_txn;
@@ -4693,7 +4693,7 @@
long propnamelen;
apr_pool_t *subpool;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rs",
&ztxn, &propname, &propnamelen)) {
return;
}
@@ -4707,7 +4707,7 @@
err = svn_fs_txn_prop(&str, txn->txn, propname, subpool);
if (err) {
- php_svn_handle_error(err TSRMLS_CC);
+ php_svn_handle_error(err);
RETVAL_FALSE;
} else if (!str) {
/* the property is not found. return an empty string */
diff -r 32907194336d svn.c
--- a/svn.c Tue Dec 29 11:05:14 2020 +0100
+++ b/svn.c Tue Dec 29 11:09:57 2020 +0100
@@ -52,7 +52,7 @@
#define PHP_SVN_AUTH_PARAM_IGNORE_SSL_VERIFY_ERRORS "php:svn:auth:ignore-ssl-verify-errors"
#define PHP_SVN_INIT_CLIENT() \
do { \
- if (init_svn_client(TSRMLS_C)) RETURN_FALSE; \
+ if (init_svn_client()) RETURN_FALSE; \
} while (0)
static void php_svn_get_version(char *buf, int buflen);
distrib
>
Mageia
>
8
>
armv7hl
>
media
>
core-backports-src
>
by-pkgid
>
ad723b0a2099472b0461a47e8f9bb58b
>
files
>
2
