Author: stsp
Date: Sat Oct 22 09:06:52 2011
New Revision: 1187676
URL: http://svn.apache.org/viewvc?rev=1187676&view=rev
Log:
Follow-up to r1186944: Simplify the code that checks for symlink-ness.
No functional change.
* subversion/libsvn_wc/update_editor.c
(close_file): Remove redundant variable SEEN_SPECIAL_PROP by initialising
INCOMING_IS_LINK to the value of LOCAL_IS_LINK before examining property
changes. Move declaration of I into outer scope to get rid of the extra
scope around the for-loop.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1187676&r1=1187675&r2=1187676&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sat Oct 22 09:06:52
2011
@@ -4262,34 +4262,28 @@ close_file(void *file_baton,
if (!fb->shadowed
&& (! fb->adding_file || fb->add_existed))
{
- svn_boolean_t local_is_link = FALSE;
- svn_boolean_t incoming_is_link = FALSE;
+ svn_boolean_t local_is_link;
+ svn_boolean_t incoming_is_link;
+ int i;
local_is_link = apr_hash_get(local_actual_props,
SVN_PROP_SPECIAL,
APR_HASH_KEY_STRING) != NULL;
- {
- int i;
- svn_boolean_t seen_special_prop = FALSE;
-
- for (i = 0; i < regular_prop_changes->nelts; ++i)
- {
- const svn_prop_t *prop = &APR_ARRAY_IDX(regular_prop_changes, i,
- svn_prop_t);
-
- if (strcmp(prop->name, SVN_PROP_SPECIAL) == 0)
- {
- seen_special_prop = TRUE;
- incoming_is_link = (prop->value != NULL);
- break;
- }
- }
+ incoming_is_link = local_is_link;
- if (!seen_special_prop)
- incoming_is_link = local_is_link;
- }
+ /* Does an incoming propchange affect symlink-ness? */
+ for (i = 0; i < regular_prop_changes->nelts; ++i)
+ {
+ const svn_prop_t *prop = &APR_ARRAY_IDX(regular_prop_changes, i,
+ svn_prop_t);
+ if (strcmp(prop->name, SVN_PROP_SPECIAL) == 0)
+ {
+ incoming_is_link = (prop->value != NULL);
+ break;
+ }
+ }
if (local_is_link != incoming_is_link)
{
