You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/09/07 12:10:22 UTC
svn commit: r1520751 - /subversion/trunk/subversion/libsvn_repos/dump.c
Author: rhuijben
Date: Sat Sep 7 10:10:22 2013
New Revision: 1520751
URL: http://svn.apache.org/r1520751
Log:
* subversion/libsvn_repos/dump.c
(verify_directory_entry): Following up on r1520419, initialize variable
before it is being used to report an error.
Found by: The warning buildbot
Modified:
subversion/trunk/subversion/libsvn_repos/dump.c
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1520751&r1=1520750&r2=1520751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Sat Sep 7 10:10:22 2013
@@ -1322,12 +1322,20 @@ verify_directory_entry(void *baton, cons
unparsed_id->data, pool));
if (found)
- return kind == dirent->kind
- ? SVN_NO_ERROR
- : svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
- _("Unexpected node kind %d for '%s'. "
- "Expected kind was %d."),
- dirent->kind, path, kind);
+ {
+ if (kind == dirent->kind)
+ return SVN_NO_ERROR;
+ else
+ {
+ path = svn_relpath_join(db->path, (const char *)key, pool);
+
+ return
+ svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
+ _("Unexpected node kind %d for '%s'. "
+ "Expected kind was %d."),
+ dirent->kind, path, kind);
+ }
+ }
}
path = svn_relpath_join(db->path, (const char *)key, pool);