On Tue, Feb 10, 2009 at 12:55:22PM +0100, Bert Huijben wrote:
> > -----Original Message-----
> > From: Stefan Sperling [mailto:stsp_at_elego.de]
> > Sent: zaterdag 17 januari 2009 1:57
> > To: svn_at_subversion.tigris.org
> > Subject: svn commit: r35295 - trunk/subversion/libsvn_wc
> >
> > For efficiency reasons, the system has converted the large body of this
> > message into an attachment.
>
> I still get a
> subversion\libsvn_wc\merge.c(1261) : warning C4700: uninitialized local
> variable 'result_target' used
>
> from this commit.
Ooops, didn't pay attention to the warnings, sorry.
Should have moved that variable into the only function that's using it.
> Could you please fix this?
I'm at college, but had time to prepare a patch (what else is there
to do during lunch break with coffee already drunk and sandwich already
eaten? :)
No svn source tree here so I couldn't compile this yet.
But does this work for you? If so, please commit.
Thanks,
Stefan
--- merge.c.orig Tue Feb 10 12:31:40 2009
+++ merge.c Tue Feb 10 12:54:44 2009
@@ -860,7 +860,6 @@ merge_text_file(const char *left,
svn_wc_conflict_version_t *left_version,
svn_wc_conflict_version_t *right_version,
const char *copyfrom_text,
- const char *result_target,
const char *detranslated_target,
const svn_prop_t *mimeprop,
const char *merge_dirpath,
@@ -870,6 +869,7 @@ merge_text_file(const char *left,
svn_diff_file_options_t *options;
svn_boolean_t contains_conflicts;
apr_file_t *result_f;
+ const char *result_target;
/* Open a second temporary file for writing; this is where diff3
will write the merged results. We want to use a tempfile
@@ -1176,7 +1176,7 @@ svn_wc__merge_internal(svn_stringbuf_t **log_accum,
{
const char *merge_dirpath;
const char *merge_filename;
- const char *detranslated_target, *result_target, *working_text;
+ const char *detranslated_target, *working_text;
svn_boolean_t is_binary = FALSE;
const svn_wc_entry_t *entry;
const svn_prop_t *mimeprop;
@@ -1253,7 +1253,6 @@ svn_wc__merge_internal(svn_stringbuf_t **log_accum,
left_version,
right_version,
copyfrom_text,
- result_target,
detranslated_target,
mimeprop,
merge_dirpath,
Received on 2009-02-10 13:59:39 CET