svn commit: r884792 - /subversion/trunk/subversion/svnadmin/main.c

[stylesen]

Author: stylesen
Date: Fri Nov 27 09:26:48 2009
New Revision: 884792

URL: http://svn.apache.org/viewvc?rev=884792&view=rev
Log:
Resolve deprecation warnings in 'svnadmin', using the new
dirent/URI/path functions.

* subversion/svnadmin/main.c
 (main): Use `svn_dirent_canonicalize()'.
 (list_dblogs): Use `svn_dirent_join()'.

Patch by: Kannan R <kann...@collab.net>
(Tweaked by me, formatting only)

Modified:
    subversion/trunk/subversion/svnadmin/main.c

Modified: subversion/trunk/subversion/svnadmin/main.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=884792&r1=884791&r2=884792&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Fri Nov 27 09:26:48 2009
@@ -903,9 +903,9 @@
   for (i = 0; i < logfiles->nelts; i++)
     {
       const char *log_utf8;
-      log_utf8 = svn_path_join(opt_state->repository_path,
-                               APR_ARRAY_IDX(logfiles, i, const char *),
-                               pool);
+      log_utf8 = svn_dirent_join(opt_state->repository_path,
+                                 APR_ARRAY_IDX(logfiles, i, const char *),
+                                 pool);
       log_utf8 = svn_dirent_local_style(log_utf8, pool);
       SVN_ERR(svn_cmdline_printf(pool, "%s\n", log_utf8));
     }
@@ -1611,7 +1611,7 @@
         break;
       case svnadmin__config_dir:
         opt_state.config_dir =
-          apr_pstrdup(pool, svn_path_canonicalize(opt_arg, pool));
+          apr_pstrdup(pool, svn_dirent_canonicalize(opt_arg, pool));
         break;
       case svnadmin__wait:
         opt_state.wait = TRUE;