svn commit: r1095729 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Apr 21 14:18:19 2011
New Revision: 1095729

URL: http://svn.apache.org/viewvc?rev=1095729&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (insert_base_node): Add a set of parenthesis to make the boolean operator
    usage more readable.
  (svn_wc__db_op_set_changelist): Avoid nonstandard C usage.

Found by: philipm
          gcc
(The baton initialization by Visual C++)

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1095729&r1=1095728&r2=1095729&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Apr 21 14:18:19 2011
@@ -851,8 +851,8 @@ insert_base_node(void *baton,
   if (*local_relpath)
     {
       if (parent_relpath
-          && (pibb->status == svn_wc__db_status_normal)
-              || (pibb->status == svn_wc__db_status_incomplete))
+          && ((pibb->status == svn_wc__db_status_normal)
+              || (pibb->status == svn_wc__db_status_incomplete)))
         {
           SVN_ERR(extend_parent_delete(wcroot, local_relpath, scratch_pool));
         }
@@ -3609,7 +3609,8 @@ svn_wc__db_op_set_changelist(svn_wc__db_
   struct set_changelist_baton_t scb = { changelist, changelists };
   struct with_triggers_baton_t wtb = { STMT_CREATE_CHANGELIST_LIST,
                                        STMT_DROP_CHANGELIST_LIST_TRIGGERS,
-                                       NULL, &scb };
+                                       NULL, NULL };
+  wtb.cb_baton = &scb;
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));