Author: moklo
Date: Sun Jun 26 07:49:36 2011
New Revision: 1139725
URL: http://svn.apache.org/viewvc?rev=1139725&view=rev
Log:
Whitespace adjustments
* subversion/libsvn_diff/diff3.c
Made first half of file match second half and norm
Modified:
subversion/trunk/subversion/libsvn_diff/diff3.c
Modified: subversion/trunk/subversion/libsvn_diff/diff3.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff3.c?rev=1139725&r1=1139724&r2=1139725&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff3.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff3.c Sun Jun 26 07:49:36 2011
@@ -41,208 +41,208 @@ svn_diff__resolve_conflict(svn_diff_t *h
svn_diff__token_index_t num_tokens,
apr_pool_t *pool)
{
- apr_off_t modified_start = hunk->modified_start + 1;
- apr_off_t latest_start = hunk->latest_start + 1;
- apr_off_t common_length;
- apr_off_t modified_length = hunk->modified_length;
- apr_off_t latest_length = hunk->latest_length;
- svn_diff__position_t *start_position[2];
- svn_diff__position_t *position[2];
- svn_diff__token_index_t *token_counts[2];
- svn_diff__lcs_t *lcs = NULL;
- svn_diff__lcs_t **lcs_ref = &lcs;
- svn_diff_t **diff_ref = &hunk->resolved_diff;
- apr_pool_t *subpool;
-
- /* First find the starting positions for the
- * comparison
- */
-
- start_position[0] = *position_list1;
- start_position[1] = *position_list2;
-
- while (start_position[0]->offset < modified_start)
- start_position[0] = start_position[0]->next;
-
- while (start_position[1]->offset < latest_start)
- start_position[1] = start_position[1]->next;
+ apr_off_t modified_start = hunk->modified_start + 1;
+ apr_off_t latest_start = hunk->latest_start + 1;
+ apr_off_t common_length;
+ apr_off_t modified_length = hunk->modified_length;
+ apr_off_t latest_length = hunk->latest_length;
+ svn_diff__position_t *start_position[2];
+ svn_diff__position_t *position[2];
+ svn_diff__token_index_t *token_counts[2];
+ svn_diff__lcs_t *lcs = NULL;
+ svn_diff__lcs_t **lcs_ref = &lcs;
+ svn_diff_t **diff_ref = &hunk->resolved_diff;
+ apr_pool_t *subpool;
- position[0] = start_position[0];
- position[1] = start_position[1];
+ /* First find the starting positions for the
+ * comparison
+ */
+
+ start_position[0] = *position_list1;
+ start_position[1] = *position_list2;
+
+ while (start_position[0]->offset < modified_start)
+ start_position[0] = start_position[0]->next;
+
+ while (start_position[1]->offset < latest_start)
+ start_position[1] = start_position[1]->next;
+
+ position[0] = start_position[0];
+ position[1] = start_position[1];
+
+ common_length = modified_length < latest_length
+ ? modified_length : latest_length;
+
+ while (common_length > 0
+ && position[0]->token_index == position[1]->token_index)
+ {
+ position[0] = position[0]->next;
+ position[1] = position[1]->next;
+
+ common_length--;
+ }
+
+ if (common_length == 0
+ && modified_length == latest_length)
+ {
+ hunk->type = svn_diff__type_diff_common;
+ hunk->resolved_diff = NULL;
+
+ *position_list1 = position[0];
+ *position_list2 = position[1];
+
+ return;
+ }
+
+ hunk->type = svn_diff__type_conflict;
+
+ /* ### If we have a conflict we can try to find the
+ * ### common parts in it by getting an lcs between
+ * ### modified (start to start + length) and
+ * ### latest (start to start + length).
+ * ### We use this lcs to create a simple diff. Only
+ * ### where there is a diff between the two, we have
+ * ### a conflict.
+ * ### This raises a problem; several common diffs and
+ * ### conflicts can occur within the same original
+ * ### block. This needs some thought.
+ * ###
+ * ### NB: We can use the node _pointers_ to identify
+ * ### different tokens
+ */
- common_length = modified_length < latest_length
- ? modified_length : latest_length;
+ subpool = svn_pool_create(pool);
- while (common_length > 0
- && position[0]->token_index == position[1]->token_index)
- {
+ /* Calculate how much of the two sequences was
+ * actually the same.
+ */
+ common_length = (modified_length < latest_length
+ ? modified_length : latest_length)
+ - common_length;
+
+ /* If there were matching symbols at the start of
+ * both sequences, record that fact.
+ */
+ if (common_length > 0)
+ {
+ lcs = apr_palloc(subpool, sizeof(*lcs));
+ lcs->next = NULL;
+ lcs->position[0] = start_position[0];
+ lcs->position[1] = start_position[1];
+ lcs->length = common_length;
+
+ lcs_ref = &lcs->next;
+ }
+
+ modified_length -= common_length;
+ latest_length -= common_length;
+
+ modified_start = start_position[0]->offset;
+ latest_start = start_position[1]->offset;
+
+ start_position[0] = position[0];
+ start_position[1] = position[1];
+
+ /* Create a new ring for svn_diff__lcs to grok.
+ * We can safely do this given we don't need the
+ * positions we processed anymore.
+ */
+ if (modified_length == 0)
+ {
+ *position_list1 = position[0];
+ position[0] = NULL;
+ }
+ else
+ {
+ while (--modified_length)
position[0] = position[0]->next;
- position[1] = position[1]->next;
-
- common_length--;
- }
-
- if (common_length == 0
- && modified_length == latest_length)
- {
- hunk->type = svn_diff__type_diff_common;
- hunk->resolved_diff = NULL;
-
- *position_list1 = position[0];
- *position_list2 = position[1];
-
- return;
- }
-
- hunk->type = svn_diff__type_conflict;
-
- /* ### If we have a conflict we can try to find the
- * ### common parts in it by getting an lcs between
- * ### modified (start to start + length) and
- * ### latest (start to start + length).
- * ### We use this lcs to create a simple diff. Only
- * ### where there is a diff between the two, we have
- * ### a conflict.
- * ### This raises a problem; several common diffs and
- * ### conflicts can occur within the same original
- * ### block. This needs some thought.
- * ###
- * ### NB: We can use the node _pointers_ to identify
- * ### different tokens
- */
-
- subpool = svn_pool_create(pool);
-
- /* Calculate how much of the two sequences was
- * actually the same.
- */
- common_length = (modified_length < latest_length
- ? modified_length : latest_length)
- - common_length;
-
- /* If there were matching symbols at the start of
- * both sequences, record that fact.
- */
- if (common_length > 0)
- {
- lcs = apr_palloc(subpool, sizeof(*lcs));
- lcs->next = NULL;
- lcs->position[0] = start_position[0];
- lcs->position[1] = start_position[1];
- lcs->length = common_length;
-
- lcs_ref = &lcs->next;
- }
-
- modified_length -= common_length;
- latest_length -= common_length;
-
- modified_start = start_position[0]->offset;
- latest_start = start_position[1]->offset;
-
- start_position[0] = position[0];
- start_position[1] = position[1];
-
- /* Create a new ring for svn_diff__lcs to grok.
- * We can safely do this given we don't need the
- * positions we processed anymore.
- */
- if (modified_length == 0)
- {
- *position_list1 = position[0];
- position[0] = NULL;
- }
- else
- {
- while (--modified_length)
- position[0] = position[0]->next;
-
- *position_list1 = position[0]->next;
- position[0]->next = start_position[0];
- }
-
- if (latest_length == 0)
- {
- *position_list2 = position[1];
- position[1] = NULL;
- }
- else
- {
- while (--latest_length)
- position[1] = position[1]->next;
-
- *position_list2 = position[1]->next;
- position[1]->next = start_position[1];
- }
-
- token_counts[0] = svn_diff__get_token_counts(position[0], num_tokens,
- subpool);
- token_counts[1] = svn_diff__get_token_counts(position[1], num_tokens,
- subpool);
-
- *lcs_ref = svn_diff__lcs(position[0], position[1], token_counts[0],
- token_counts[1], num_tokens, 0, 0, subpool);
-
- /* Fix up the EOF lcs element in case one of
- * the two sequences was NULL.
- */
- if ((*lcs_ref)->position[0]->offset == 1)
- (*lcs_ref)->position[0] = *position_list1;
-
- if ((*lcs_ref)->position[1]->offset == 1)
- (*lcs_ref)->position[1] = *position_list2;
-
- /* Produce the resolved diff */
- while (1)
- {
- if (modified_start < lcs->position[0]->offset
- || latest_start < lcs->position[1]->offset)
- {
- (*diff_ref) = apr_palloc(pool, sizeof(**diff_ref));
-
- (*diff_ref)->type = svn_diff__type_conflict;
- (*diff_ref)->original_start = hunk->original_start;
- (*diff_ref)->original_length = hunk->original_length;
- (*diff_ref)->modified_start = modified_start - 1;
- (*diff_ref)->modified_length = lcs->position[0]->offset
- - modified_start;
- (*diff_ref)->latest_start = latest_start - 1;
- (*diff_ref)->latest_length = lcs->position[1]->offset
- - latest_start;
- (*diff_ref)->resolved_diff = NULL;
-
- diff_ref = &(*diff_ref)->next;
- }
- /* Detect the EOF */
- if (lcs->length == 0)
- break;
+ *position_list1 = position[0]->next;
+ position[0]->next = start_position[0];
+ }
+
+ if (latest_length == 0)
+ {
+ *position_list2 = position[1];
+ position[1] = NULL;
+ }
+ else
+ {
+ while (--latest_length)
+ position[1] = position[1]->next;
- modified_start = lcs->position[0]->offset;
- latest_start = lcs->position[1]->offset;
+ *position_list2 = position[1]->next;
+ position[1]->next = start_position[1];
+ }
- (*diff_ref) = apr_palloc(pool, sizeof(**diff_ref));
+ token_counts[0] = svn_diff__get_token_counts(position[0], num_tokens,
+ subpool);
+ token_counts[1] = svn_diff__get_token_counts(position[1], num_tokens,
+ subpool);
- (*diff_ref)->type = svn_diff__type_diff_common;
- (*diff_ref)->original_start = hunk->original_start;
- (*diff_ref)->original_length = hunk->original_length;
- (*diff_ref)->modified_start = modified_start - 1;
- (*diff_ref)->modified_length = lcs->length;
- (*diff_ref)->latest_start = latest_start - 1;
- (*diff_ref)->latest_length = lcs->length;
- (*diff_ref)->resolved_diff = NULL;
+ *lcs_ref = svn_diff__lcs(position[0], position[1], token_counts[0],
+ token_counts[1], num_tokens, 0, 0, subpool);
- diff_ref = &(*diff_ref)->next;
+ /* Fix up the EOF lcs element in case one of
+ * the two sequences was NULL.
+ */
+ if ((*lcs_ref)->position[0]->offset == 1)
+ (*lcs_ref)->position[0] = *position_list1;
+
+ if ((*lcs_ref)->position[1]->offset == 1)
+ (*lcs_ref)->position[1] = *position_list2;
+
+ /* Produce the resolved diff */
+ while (1)
+ {
+ if (modified_start < lcs->position[0]->offset
+ || latest_start < lcs->position[1]->offset)
+ {
+ (*diff_ref) = apr_palloc(pool, sizeof(**diff_ref));
+
+ (*diff_ref)->type = svn_diff__type_conflict;
+ (*diff_ref)->original_start = hunk->original_start;
+ (*diff_ref)->original_length = hunk->original_length;
+ (*diff_ref)->modified_start = modified_start - 1;
+ (*diff_ref)->modified_length = lcs->position[0]->offset
+ - modified_start;
+ (*diff_ref)->latest_start = latest_start - 1;
+ (*diff_ref)->latest_length = lcs->position[1]->offset
+ - latest_start;
+ (*diff_ref)->resolved_diff = NULL;
+
+ diff_ref = &(*diff_ref)->next;
+ }
+
+ /* Detect the EOF */
+ if (lcs->length == 0)
+ break;
+
+ modified_start = lcs->position[0]->offset;
+ latest_start = lcs->position[1]->offset;
+
+ (*diff_ref) = apr_palloc(pool, sizeof(**diff_ref));
+
+ (*diff_ref)->type = svn_diff__type_diff_common;
+ (*diff_ref)->original_start = hunk->original_start;
+ (*diff_ref)->original_length = hunk->original_length;
+ (*diff_ref)->modified_start = modified_start - 1;
+ (*diff_ref)->modified_length = lcs->length;
+ (*diff_ref)->latest_start = latest_start - 1;
+ (*diff_ref)->latest_length = lcs->length;
+ (*diff_ref)->resolved_diff = NULL;
+
+ diff_ref = &(*diff_ref)->next;
- modified_start += lcs->length;
- latest_start += lcs->length;
+ modified_start += lcs->length;
+ latest_start += lcs->length;
- lcs = lcs->next;
- }
+ lcs = lcs->next;
+ }
- *diff_ref = NULL;
+ *diff_ref = NULL;
- svn_pool_destroy(subpool);
+ svn_pool_destroy(subpool);
}
