From 2a2bff469b0dacf5d773ca8cad549e902e9a5f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 19 Jul 2017 23:13:39 +0000 Subject: More endian fixes. --- subvertpy/client.c | 34 +++++++++++++++++----------------- subvertpy/repos.c | 11 +++++------ subvertpy/util.c | 6 +++--- subvertpy/util.h | 2 +- subvertpy/wc.c | 30 +++++++++++++++--------------- 5 files changed, 41 insertions(+), 42 deletions(-) (limited to 'subvertpy') diff --git a/subvertpy/client.c b/subvertpy/client.c index cbc5b580..7fe3cccf 100644 --- a/subvertpy/client.c +++ b/subvertpy/client.c @@ -986,7 +986,7 @@ static PyObject *client_delete(PyObject *self, PyObject *args) static PyObject *client_mkdir(PyObject *self, PyObject *args) { PyObject *paths, *revprops = NULL; - svn_boolean_t make_parents=FALSE; + bool make_parents = false; apr_pool_t *temp_pool; svn_commit_info_t *commit_info = NULL; PyObject *ret; @@ -1024,7 +1024,7 @@ static PyObject *client_mkdir(PyObject *self, PyObject *args) RUN_SVN_WITH_POOL(temp_pool, svn_client_mkdir3(&commit_info, apr_paths, - make_parents, hash_revprops, client->client, temp_pool)); + make_parents?TRUE:FALSE, hash_revprops, client->client, temp_pool)); #else if (make_parents) { PyErr_SetString(PyExc_ValueError, @@ -1410,8 +1410,8 @@ static PyObject *client_update(PyObject *self, PyObject *args, PyObject *kwargs) PyObject *ret; int i = 0; ClientObject *client = (ClientObject *)self; - svn_boolean_t allow_unver_obstructions = FALSE, - depth_is_sticky = FALSE; + bool allow_unver_obstructions = false, + depth_is_sticky = false; char *kwnames[] = { "path", "revision", "recurse", "ignore_externals", "depth_is_sticky", "allow_unver_obstructions", NULL }; @@ -1433,7 +1433,7 @@ static PyObject *client_update(PyObject *self, PyObject *args, PyObject *kwargs) #if ONLY_SINCE_SVN(1, 5) RUN_SVN_WITH_POOL(temp_pool, svn_client_update3(&result_revs, apr_paths, &c_rev, recurse?svn_depth_infinity:svn_depth_files, - depth_is_sticky, ignore_externals, allow_unver_obstructions, + depth_is_sticky?TRUE:FALSE, ignore_externals, allow_unver_obstructions?TRUE:FALSE, client->client, temp_pool)); #else RUN_SVN_WITH_POOL(temp_pool, svn_client_update2(&result_revs, @@ -1653,8 +1653,8 @@ static PyObject *client_log(PyObject *self, PyObject *args, PyObject *kwargs) PyObject *callback, *paths, *start_rev = Py_None, *end_rev = Py_None, *peg_revision = Py_None, *revprops = NULL; int limit = 0; - svn_boolean_t discover_changed_paths = FALSE, strict_node_history = FALSE, - include_merged_revisions = FALSE; + bool discover_changed_paths = false, strict_node_history = false, + include_merged_revisions = false; apr_array_header_t *apr_paths, *apr_revprops = NULL; svn_opt_revision_t c_peg_rev, c_start_rev, c_end_rev; #if ONLY_SINCE_SVN(1, 6) @@ -1719,24 +1719,24 @@ static PyObject *client_log(PyObject *self, PyObject *args, PyObject *kwargs) APR_ARRAY_PUSH(revision_ranges, svn_opt_revision_range_t *) = &revision_range; RUN_SVN_WITH_POOL(temp_pool, svn_client_log5(apr_paths, &c_peg_rev, - revision_ranges, limit, discover_changed_paths, - strict_node_history, include_merged_revisions, apr_revprops, + revision_ranges, limit, discover_changed_paths?TRUE:FALSE, + strict_node_history?TRUE:FALSE, include_merged_revisions?TRUE:FALSE, apr_revprops, py_svn_log_entry_receiver, (void*)callback, client->client, temp_pool)); #elif ONLY_SINCE_SVN(1, 5) RUN_SVN_WITH_POOL(temp_pool, svn_client_log4(apr_paths, &c_peg_rev, - &c_start_rev, &c_end_rev, limit, discover_changed_paths, - strict_node_history, include_merged_revisions, apr_revprops, + &c_start_rev, &c_end_rev, limit, discover_changed_paths?TRUE:FALSE, + strict_node_history?TRUE:FALSE, include_merged_revisions?TRUE:FALSE, apr_revprops, py_svn_log_entry_receiver, (void*)callback, client->client, temp_pool)); #elif ONLY_SINCE_SVN(1, 4) RUN_SVN_WITH_POOL(temp_pool, svn_client_log3(apr_paths, &c_peg_rev, - &c_start_rev, &c_end_rev, limit, discover_changed_paths, - strict_node_history, py_svn_log_wrapper, + &c_start_rev, &c_end_rev, limit, discover_changed_paths?TRUE:FALSE, + strict_node_history?TRUE:FALSE, py_svn_log_wrapper, (void*)callback, client->client, temp_pool)); #else RUN_SVN_WITH_POOL(temp_pool, svn_client_log2(apr_paths, &c_start_rev, - &c_end_rev, limit, discover_changed_paths, strict_node_history, + &c_end_rev, limit, discover_changed_paths?TRUE:FALSE, strict_node_history?TRUE:FALSE, py_svn_log_wrapper, (void*)callback, client->client, temp_pool)); #endif @@ -1757,7 +1757,7 @@ static PyObject *client_info(PyObject *self, PyObject *args, PyObject *kwargs) const char *path; int depth = svn_depth_empty; - svn_boolean_t fetch_excluded = FALSE, fetch_actual_only = FALSE; + bool fetch_excluded = false, fetch_actual_only = false; PyObject *revision = Py_None, *peg_revision = Py_None; svn_opt_revision_t c_peg_rev, c_rev; PyObject *entry_dict; @@ -1798,8 +1798,8 @@ static PyObject *client_info(PyObject *self, PyObject *args, PyObject *kwargs) Py_BEGIN_ALLOW_THREADS; #if ONLY_SINCE_SVN(1, 7) /* FIXME: Support changelists */ - err = svn_client_info3(path, &c_peg_rev, &c_rev, depth, fetch_excluded, - fetch_actual_only, NULL, + err = svn_client_info3(path, &c_peg_rev, &c_rev, depth, fetch_excluded?TRUE:FALSE, + fetch_actual_only?TRUE:FALSE, NULL, info_receiver, entry_dict, client->client, temp_pool); diff --git a/subvertpy/repos.c b/subvertpy/repos.c index e54cbfbf..e6a41c15 100644 --- a/subvertpy/repos.c +++ b/subvertpy/repos.c @@ -386,7 +386,7 @@ static PyObject *repos_delete(PyObject *self, PyObject *args) static PyObject *repos_hotcopy(RepositoryObject *self, PyObject *args) { char *src_path, *dest_path; - svn_boolean_t clean_logs = FALSE; + bool clean_logs = false; apr_pool_t *temp_pool; if (!PyArg_ParseTuple(args, "ss|b", &src_path, &dest_path, &clean_logs)) @@ -397,7 +397,7 @@ static PyObject *repos_hotcopy(RepositoryObject *self, PyObject *args) return NULL; RUN_SVN_WITH_POOL(temp_pool, - svn_repos_hotcopy(src_path, dest_path, clean_logs, temp_pool)); + svn_repos_hotcopy(src_path, dest_path, clean_logs?TRUE:FALSE, temp_pool)); apr_pool_destroy(temp_pool); @@ -807,7 +807,7 @@ static PyObject *fs_node_file_proplist(FileSystemRootObject *self, PyObject *arg static PyObject *fs_root_file_checksum(FileSystemRootObject *self, PyObject *args) { apr_pool_t *temp_pool; - svn_boolean_t force = FALSE; + bool force = false; char *path; #if ONLY_SINCE_SVN(1, 6) svn_checksum_kind_t kind; @@ -826,9 +826,8 @@ static PyObject *fs_root_file_checksum(FileSystemRootObject *self, PyObject *arg if (temp_pool == NULL) return NULL; #if ONLY_SINCE_SVN(1, 6) - RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_checksum(&checksum, kind, - self->root, - path, force, temp_pool)); + RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_checksum( + &checksum, kind, self->root, path, force?TRUE:FALSE, temp_pool)); cstr = svn_checksum_to_cstring(checksum, temp_pool); if (cstr == NULL) { ret = Py_None; diff --git a/subvertpy/util.c b/subvertpy/util.c index 4e9a1ea4..49c68899 100644 --- a/subvertpy/util.c +++ b/subvertpy/util.c @@ -958,7 +958,7 @@ static PyObject *stream_init(PyTypeObject *type, PyObject *args, PyObject *kwarg if (ret->pool == NULL) return NULL; ret->stream = svn_stream_empty(ret->pool); - ret->closed = FALSE; + ret->closed = false; return (PyObject *)ret; } @@ -967,7 +967,7 @@ static PyObject *stream_close(StreamObject *self) { if (!self->closed) { svn_stream_close(self->stream); - self->closed = TRUE; + self->closed = true; } Py_RETURN_NONE; } @@ -1032,7 +1032,7 @@ static PyObject *stream_read_full(StreamObject *self, PyObject *args) self->stream, temp_pool, temp_pool)); - self->closed = TRUE; + self->closed = true; ret = PyBytes_FromStringAndSize(result->data, result->len); apr_pool_destroy(temp_pool); return ret; diff --git a/subvertpy/util.h b/subvertpy/util.h index cf4a42f0..08e2905d 100644 --- a/subvertpy/util.h +++ b/subvertpy/util.h @@ -132,7 +132,7 @@ typedef struct { PyObject_HEAD svn_stream_t *stream; apr_pool_t *pool; - svn_boolean_t closed; + bool closed; } StreamObject; extern PyTypeObject Stream_Type; diff --git a/subvertpy/wc.c b/subvertpy/wc.c index 704ff28c..4b782a03 100644 --- a/subvertpy/wc.c +++ b/subvertpy/wc.c @@ -1074,8 +1074,8 @@ static PyObject *adm_crawl_revisions(PyObject *self, PyObject *args, PyObject *k apr_pool_t *temp_pool; AdmObject *admobj = (AdmObject *)self; svn_wc_traversal_info_t *traversal_info; - svn_boolean_t depth_compatibility_trick = FALSE; - svn_boolean_t honor_depth_exclude = FALSE; + bool depth_compatibility_trick = false; + bool honor_depth_exclude = false; char *kwnames[] = { "path", "reporter", "restore_files", "recurse", "use_commit_times", "notify_func", "depth_compatibility_trick", "honor_depth_exclude,", NULL }; PyObject *py_path; @@ -1101,8 +1101,8 @@ static PyObject *adm_crawl_revisions(PyObject *self, PyObject *args, PyObject *k RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions4(path, admobj->adm, &py_ra_reporter, (void *)reporter, restore_files, recurse?svn_depth_infinity:svn_depth_files, - honor_depth_exclude, - depth_compatibility_trick, use_commit_times, + honor_depth_exclude?TRUE:FALSE, + depth_compatibility_trick?TRUE:FALSE, use_commit_times, py_wc_notify_func, (void *)notify_func, traversal_info, temp_pool)); #elif ONLY_SINCE_SVN(1, 5) @@ -1143,8 +1143,8 @@ static PyObject *adm_get_update_editor(PyObject *self, PyObject *args) apr_pool_t *pool; svn_revnum_t *latest_revnum; svn_error_t *err; - svn_boolean_t allow_unver_obstructions = FALSE; - svn_boolean_t depth_is_sticky = FALSE; + bool allow_unver_obstructions = false; + bool depth_is_sticky = false; if (!PyArg_ParseTuple(args, "s|bbOzbb", &target, &use_commit_times, &recurse, ¬ify_func, &diff3_cmd, &depth_is_sticky, @@ -1164,7 +1164,7 @@ static PyObject *adm_get_update_editor(PyObject *self, PyObject *args) /* FIXME: Support conflict func */ err = svn_wc_get_update_editor3(latest_revnum, admobj->adm, target, use_commit_times, recurse?svn_depth_infinity:svn_depth_files, - depth_is_sticky, allow_unver_obstructions, + depth_is_sticky?TRUE:FALSE, allow_unver_obstructions?TRUE:FALSE, py_wc_notify_func, (void *)notify_func, py_cancel_check, NULL, NULL, NULL, NULL, NULL, @@ -1283,7 +1283,7 @@ static PyObject *adm_process_committed(PyObject *self, PyObject *args, PyObject AdmObject *admobj = (AdmObject *)self; apr_pool_t *temp_pool; int digest_len; - svn_boolean_t remove_changelist = FALSE; + bool remove_changelist = false; char *kwnames[] = { "path", "recurse", "new_revnum", "rev_date", "rev_author", "wcprop_changes", "remove_lock", "digest", "remove_changelist", NULL }; @@ -1317,7 +1317,7 @@ static PyObject *adm_process_committed(PyObject *self, PyObject *args, PyObject RUN_SVN_WITH_POOL(temp_pool, svn_wc_process_committed4( path, admobj->adm, recurse, new_revnum, rev_date, rev_author, wcprop_changes, - remove_lock, remove_changelist, digest, temp_pool)); + remove_lock, remove_changelist?TRUE:FALSE, digest, temp_pool)); #else if (remove_changelist) { PyErr_SetString(PyExc_NotImplementedError, "remove_changelist only supported in svn < 1.6"); @@ -2431,9 +2431,9 @@ static PyObject *committed_queue_queue(CommittedQueueObject *self, PyObject *arg char *path; AdmObject *admobj; PyObject *py_wcprop_changes = Py_None; - svn_boolean_t remove_lock = FALSE, remove_changelist = FALSE; + bool remove_lock = false, remove_changelist = false; char *md5_digest = NULL, *sha1_digest = NULL; - svn_boolean_t recurse = FALSE; + bool recurse = false; apr_pool_t *temp_pool; apr_array_header_t *wcprop_changes; int md5_digest_len, sha1_digest_len; @@ -2501,14 +2501,14 @@ static PyObject *committed_queue_queue(CommittedQueueObject *self, PyObject *arg svn_checksum_p = NULL; } RUN_SVN_WITH_POOL(temp_pool, - svn_wc_queue_committed2(self->queue, path, admobj->adm, recurse, - wcprop_changes, remove_lock, remove_changelist, + svn_wc_queue_committed2(self->queue, path, admobj->adm, recurse?TRUE:FALSE, + wcprop_changes, remove_lock?TRUE:FALSE, remove_changelist?TRUE:FALSE, svn_checksum_p, temp_pool)); } #else RUN_SVN_WITH_POOL(temp_pool, - svn_wc_queue_committed(&self->queue, path, admobj->adm, recurse, - wcprop_changes, remove_lock, remove_changelist, + svn_wc_queue_committed(&self->queue, path, admobj->adm, recurse?TRUE:FALSE, + wcprop_changes, remove_lock?TRUE:FALSE, remove_changelist?TRUE:FALSE, (unsigned char *)md5_digest, temp_pool)); #endif -- cgit v1.2.3