You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <rh...@sharpsvn.net> on 2009/03/31 15:06:52 UTC
RE: svn commit: r36894 - in trunk/subversion: libsvn_client
libsvn_repos mod_dav_svn svn
> -----Original Message-----
> From: Senthil Kumaran S [mailto:senthil@collab.net]
> Sent: dinsdag 31 maart 2009 16:52
> To: svn@subversion.tigris.org
> Subject: svn commit: r36894 - in trunk/subversion: libsvn_client
libsvn_repos
> mod_dav_svn svn
>
> Author: stylesen
> Date: Tue Mar 31 07:51:57 2009
> New Revision: 36894
>
> Log:
> Fix deprecated warning of 'svn_path_split' usage.
>
> * subversion/mod_dav_svn/repos.c
> (get_parent_path): Include svn_dirent_uri.h and fix usage of deprecated
> function svn_path_split.
>
> * subversion/svn/util.c
> (svn_cl__edit_file_externally): Same.
>
> * subversion/svn/propedit-cmd.c
> (svn_cl__propedit): Same.
>
> * subversion/libsvn_client/delete.c
> (delete_urls): Same.
>
> * subversion/libsvn_client/externals.c
> (relegate_dir_external, handle_external_item_change): Same.
>
> * subversion/libsvn_client/info.c
> (svn_client_info2): Same.
>
> * subversion/libsvn_client/patch.c
> (merge_file_deleted, merge_dir_deleted): Same.
>
> * subversion/libsvn_client/diff.c
> (diff_prepare_repos_repos): Same.
>
> * subversion/libsvn_repos/authz.c
> (svn_repos_authz_check_access): Same.
>
> Modified:
> trunk/subversion/libsvn_client/delete.c
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_client/externals.c
> trunk/subversion/libsvn_client/info.c
> trunk/subversion/libsvn_client/patch.c
> trunk/subversion/libsvn_repos/authz.c
> trunk/subversion/mod_dav_svn/repos.c
> trunk/subversion/svn/propedit-cmd.c
> trunk/subversion/svn/util.c
>
<snip />
> Modified: trunk/subversion/mod_dav_svn/repos.c
> URL:
>
http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/repos.c?pathre
v=
> 36894&r1=36893&r2=36894
>
============================================================================
==
> --- trunk/subversion/mod_dav_svn/repos.c Tue Mar 31 06:43:33 2009
> (r36893)
> +++ trunk/subversion/mod_dav_svn/repos.c Tue Mar 31 07:51:57 2009
> (r36894)
> @@ -41,6 +41,7 @@
> #include "svn_props.h"
> #include "mod_dav_svn.h"
> #include "svn_ra.h" /* for SVN_RA_CAPABILITY_* */
> +#include "svn_dirent_uri.h"
> #include "private/svn_log.h"
>
> #include "dav_svn.h"
> @@ -2258,10 +2259,10 @@ get_parent_path(const char *path, apr_po
>
> if (len > 0)
> {
> - /* Remove any trailing slash; else svn_path_split() asserts. */
> + /* Remove any trailing slash; else svn_dirent_split() asserts. */
> if (tmp[len-1] == '/')
> tmp[len-1] = '\0';
> - svn_path_split(tmp, &parentpath, &base_name, pool);
> + svn_dirent_split(tmp, &parentpath, &base_name, pool);
>
> return parentpath;
> }
This should probably be svn_uri_split() and if it isn't the '/' can't be
removed because a final '/' can be valid in a dirent. (E.g. "C:/"). In that
case one of the dirent normalization methods should be used.
>
> Modified: trunk/subversion/svn/propedit-cmd.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/propedit-
> cmd.c?pathrev=36894&r1=36893&r2=36894
>
============================================================================
==
> --- trunk/subversion/svn/propedit-cmd.c Tue Mar 31 06:43:33 2009
> (r36893)
> +++ trunk/subversion/svn/propedit-cmd.c Tue Mar 31 07:51:57 2009
> (r36894)
> @@ -27,6 +27,7 @@
> #include "svn_pools.h"
> #include "svn_client.h"
> #include "svn_string.h"
> +#include "svn_dirent_uri.h"
> #include "svn_path.h"
> #include "svn_error.h"
> #include "svn_utf.h"
> @@ -226,7 +227,7 @@ svn_cl__propedit(apr_getopt_t *os,
> (SVN_ERR_ENTRY_NOT_FOUND, NULL,
> _("'%s' does not appear to be a working copy path"),
> target);
> if (entry->kind == svn_node_file)
> - svn_path_split(target, &base_dir, NULL, subpool);
> + svn_dirent_split(target, &base_dir, NULL, subpool);
> }
This can be rewritten as base_dir = svn_dirent_dirname(target, subpool), but
I don't think that matters here.
<snip />
Thanks for resolving these deprecation warnings,
(I should really deprecate svn_path_is_child() too, as it has some severe
Windows dirent issues as well).
Bert
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1496593
Re: svn commit: r36894 - in trunk/subversion: libsvn_client
libsvn_repos mod_dav_svn svn
Posted by Senthil Kumaran S <se...@collab.net>.
Greg Stein wrote:
>> This should probably be svn_uri_split() and if it isn't the '/' can't be
>> removed because a final '/' can be valid in a dirent. (E.g. "C:/"). In that
>> case one of the dirent normalization methods should be used.
>
> Ah... svn_uri_split() is correct. mod_dav_svn doesn't really deal with dirents.
Done in r36916.
--
Senthil Kumaran S
http://www.stylesen.org/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1504298
Re: svn commit: r36894 - in trunk/subversion: libsvn_client
libsvn_repos mod_dav_svn svn
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Mar 31, 2009 at 17:06, Bert Huijben <rh...@sharpsvn.net> wrote:
>...
>> +++ trunk/subversion/mod_dav_svn/repos.c Tue Mar 31 07:51:57 2009
>...
>> @@ -2258,10 +2259,10 @@ get_parent_path(const char *path, apr_po
>>
>> if (len > 0)
>> {
>> - /* Remove any trailing slash; else svn_path_split() asserts. */
>> + /* Remove any trailing slash; else svn_dirent_split() asserts. */
>> if (tmp[len-1] == '/')
>> tmp[len-1] = '\0';
>> - svn_path_split(tmp, &parentpath, &base_name, pool);
>> + svn_dirent_split(tmp, &parentpath, &base_name, pool);
>>
>> return parentpath;
>> }
>
> This should probably be svn_uri_split() and if it isn't the '/' can't be
> removed because a final '/' can be valid in a dirent. (E.g. "C:/"). In that
> case one of the dirent normalization methods should be used.
Ah... svn_uri_split() is correct. mod_dav_svn doesn't really deal with dirents.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1496627