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

Re: svn commit: r17232 - branches/svndiff1/subversion/libsvn_delta

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-11-07 18:54:25 CET

dberlin@tigris.org writes:

> Author: dberlin
> Date: Mon Nov 7 09:06:38 2005
> New Revision: 17232

> --- branches/svndiff1/subversion/libsvn_delta/svndiff.c (original)
> +++ branches/svndiff1/subversion/libsvn_delta/svndiff.c Mon Nov 7 09:06:38 2005
> @@ -217,7 +217,7 @@
> append_encoded_int (header, window->tview_len, pool);
> if (err == SVN_NO_ERROR && eb->version == 1)

Looking at the whole function I see that err is initialised but not
otherwise used before this conditional, so it will always have the
value SVN_NO_ERROR here and in the next conditional.

The err variable was present before your change, but I'm not sure why
it exists. Is there some reason that the statements that set err, the
calls to svn_stream_write, don't use SVN_ERR? Perhaps it's important
that the svn_destroy_pool line at the end of the function gets
executed even when an error occurs? If so then your use of SVN_ERR
might be wrong since it will bypass that line. There is a similar
problem with the SVN_ERR that occurs near the start of the function,
but that might be a bug as well.

> {
> - err = zlib_encode (instructions, i1);
> + SVN_ERR (zlib_encode (instructions, i1));
> instructions = i1;
> }
> append_encoded_int (header, instructions->len, pool);
> @@ -225,7 +225,7 @@
> {
> svn_stringbuf_t *temp;
> temp = svn_stringbuf_create_from_string (window->new_data, pool);
> - err = zlib_encode (temp, newdata);
> + SVN_ERR (zlib_encode (temp, newdata));
> window->new_data = svn_string_create_from_buf (newdata, pool);
> }

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 7 18:55:23 2005

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