You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/05/29 15:56:55 UTC

svn commit: r1682470 - /subversion/trunk/subversion/include/svn_client.h

Author: stsp
Date: Fri May 29 13:56:55 2015
New Revision: 1682470

URL: http://svn.apache.org/r1682470
Log:
* subversion/include/svn_client.h
  (svn_client_conflict_get_local_abspath,
   svn_client_conflict_get_node_kind,
   svn_client_conflict_get_kind,
   svn_client_conflict_get_property_name,
   svn_client_conflict_get_is_binary,
   svn_client_conflict_get_mime_type,
   svn_client_conflict_get_action,
   svn_client_conflict_get_reason,
   svn_client_conflict_get_base_abspath,
   svn_client_conflict_get_their_abspath,
   svn_client_conflict_get_my_abspath,
   svn_client_conflict_get_merged_file,
   svn_client_conflict_get_operation,
   svn_client_conflict_get_src_left_version,
   svn_client_conflict_get_src_right_version,
   svn_client_conflict_get_prop_reject_abspath,
   svn_client_conflict_get_prop_value_working,
   svn_client_conflict_get_prop_value_incoming_old,
   svn_client_conflict_get_prop_value_incoming_new): Put parentheses around
     macro arguments for correctness reasons.

Pointed out by: danielsh

Modified:
    subversion/trunk/subversion/include/svn_client.h

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1682470&r1=1682469&r2=1682470&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri May 29 13:56:55 2015
@@ -4369,61 +4369,61 @@ svn_client_revert(const apr_array_header
  * @since New in 1.10. 
  */
 #define svn_client_conflict_get_local_abspath(conflict) \
-  (conflict->local_abspath)
+  ((conflict)->local_abspath)
 
 #define svn_client_conflict_get_node_kind(conflict) \
-  (conflict->node_kind)
+  ((conflict)->node_kind)
 
 #define svn_client_conflict_get_kind(conflict) \
-  (conflict->kind)
+  ((conflict)->kind)
 
 #define svn_client_conflict_get_property_name(conflict) \
-  (conflict->property_name)
+  ((conflict)->property_name)
 
 #define svn_client_conflict_get_is_binary(conflict) \
-  (conflict->is_binary)
+  ((conflict)->is_binary)
 
 #define svn_client_conflict_get_mime_type(conflict) \
-  (conflict->mime_type)
+  ((conflict)->mime_type)
 
 #define svn_client_conflict_get_action(conflict) \
-  (conflict->action)
+  ((conflict)->action)
 
 #define svn_client_conflict_get_reason(conflict) \
-  (conflict->reason)
+  ((conflict)->reason)
 
 #define svn_client_conflict_get_base_abspath(conflict) \
-  (conflict->base_abspath)
+  ((conflict)->base_abspath)
 
 #define svn_client_conflict_get_their_abspath(conflict) \
-  (conflict->their_abspath)
+  ((conflict)->their_abspath)
 
 #define svn_client_conflict_get_my_abspath(conflict) \
-  (conflict->my_abspath)
+  ((conflict)->my_abspath)
 
 #define svn_client_conflict_get_merged_file(conflict) \
-  (conflict->merged_file)
+  ((conflict)->merged_file)
 
 #define svn_client_conflict_get_operation(conflict) \
-  (conflict->operation)
+  ((conflict)->operation)
 
 #define svn_client_conflict_get_src_left_version(conflict) \
-  (conflict->src_left_version)
+  ((conflict)->src_left_version)
 
 #define svn_client_conflict_get_src_right_version(conflict) \
-  (conflict->src_right_version)
+  ((conflict)->src_right_version)
 
 #define svn_client_conflict_get_prop_reject_abspath(conflict) \
-  (conflict->prop_reject_abspath)
+  ((conflict)->prop_reject_abspath)
 
 #define svn_client_conflict_get_prop_value_working(conflict) \
-  (conflict->prop_value_working)
+  ((conflict)->prop_value_working)
 
 #define svn_client_conflict_get_prop_value_incoming_old(conflict) \
-  (conflict->prop_value_incoming_old)
+  ((conflict)->prop_value_incoming_old)
 
 #define svn_client_conflict_get_prop_value_incoming_new(conflict) \
-  (conflict->prop_value_incoming_new)
+  ((conflict)->prop_value_incoming_new)
 
 /** @} */