[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Fix some deprecation warnings

From: vijay <vijay_at_collab.net>
Date: Fri, 24 Dec 2010 15:46:55 +0530

On Wednesday 22 December 2010 06:42 PM, Daniel Shahaf wrote:
> Kamesh Jayachandran wrote on Wed, Dec 22, 2010 at 15:10:46 +0530:
>> On 12/22/2010 02:02 AM, vijay wrote:
>>> Hi,
>>>
>>> I have attached a patch that fixes few deprecation warnings while
>>> compiling libsvn_client/log.c.
>>> Attached log message also.
>>>
>>> Thanks& Regards,
>>> Vijayaguru
>> Can you pass scratch_pool for the below call as 'iterpool' and move the
>> iterpool destruction down?
>>
> ... presumably in order to save a bit of memory.
>
> Daniel
> (not disagreeing)
>
I used iterpool in place of scratch pool and moved the iterpool
destruction down. There are two failures in log_tests.py:7 & 9 with the
following error_trace.

<snip>
CMD: /home/vijayaguru/svn-sandbox/svn-trunk/vpath/subversion/svn/svn log
svn-test-work/working_copies/log_tests-7/A/B/E/beta_at_8 --config-dir
/home/vijayaguru/svn-sandbox/svn-trunk/vpath/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.034555>
../subversion/svn/log-cmd.c:743: (apr_err=22)
../subversion/libsvn_client/log.c:486: (apr_err=22)
../subversion/libsvn_client/ra.c:482: (apr_err=22)
../subversion/libsvn_client/url.c:53: (apr_err=22)
../subversion/libsvn_subr/dirent_uri.c:1667: (apr_err=22)
../subversion/libsvn_subr/utf.c:837: (apr_err=22)
../subversion/libsvn_subr/utf.c:604: (apr_err=22)
svn: Valid UTF-8 data
(hex:)
followed by invalid UTF-8 sequence
(hex: e0 65 30 00)
Traceback (most recent call last):
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 1212, in run
     rc = self.pred.run(sandbox)
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/testcase.py",
line 170, in run
     return self.func(sandbox)
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/log_tests.py",
line 762, in log_wc_with_peg_revision
     'log', my_path)
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/actions.py",
line 264, in run_and_verify_svn
     expected_exit, *varargs)
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/actions.py",
line 302, in run_and_verify_svn2
     exit_code, out, err = main.run_svn(want_err, *varargs)
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 580, in run_svn
     *(_with_auth(_with_config_dir(varargs))))
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 338, in run_command
     None, *varargs)
   File
"/home/vijayaguru/svn-sandbox/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 513, in run_command_stdin
     raise Failure
Failure
FAIL: log_tests.py 7: 'svn log wc_target_at_N'
<snip>

The following function 'svn_uri_condense_targets()' stores its return
value of 'url_or_path' in scratch pool(here iterpool) which should not
be the case.

SVN_ERR(svn_uri_condense_targets(&url_or_path, &condensed_targets,
                                  target_urls, TRUE, pool, iterpool));

We have to copy the return value from scratch pool to result pool before
exiting from the function, right?
I will send a patch to fix it in dirent_uri.c: svn_uri_condense_targets().

Thanks & Regards,
vijayaguru
>> + SVN_ERR(svn_uri_condense_targets(&url_or_path,&condensed_targets,
>> + target_urls, TRUE, pool, pool));
>>
>>
>>
>>
>> With regards
>> Kamesh Jayachandran
Received on 2010-12-24 11:17:42 CET

This is an archived mail posted to the Subversion Dev mailing list.