subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1368136 - /subversion/trunk/subversion/svn/main.c
Date Wed, 01 Aug 2012 17:42:35 GMT
Author: julianfoad
Date: Wed Aug  1 17:42:35 2012
New Revision: 1368136

URL: http://svn.apache.org/viewvc?rev=1368136&view=rev
Log:
* subversion/svn/main.c
  (main): Don't leak an error on failure to convert an option argument to
    UTF-8: instead, include the child error in the error report.

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

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1368136&r1=1368135&r2=1368136&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Aug  1 17:42:35 2012
@@ -1894,7 +1894,7 @@ main(int argc, const char *argv[])
         err = svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool);
         if (err)
           return svn_cmdline_handle_exit_error
-            (svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+            (svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, err,
                                _("Error converting depth "
                                  "from locale to UTF-8")), pool, "svn: ");
         opt_state.depth = svn_depth_from_word(utf8_opt_arg);
@@ -1913,7 +1913,7 @@ main(int argc, const char *argv[])
         err = svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool);
         if (err)
           return svn_cmdline_handle_exit_error
-            (svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+            (svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, err,
                                _("Error converting depth "
                                  "from locale to UTF-8")), pool, "svn: ");
         opt_state.set_depth = svn_depth_from_word(utf8_opt_arg);



Mime
View raw message