You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/10/29 06:26:08 UTC
svn commit: r1028613 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: hwright
Date: Fri Oct 29 04:26:08 2010
New Revision: 1028613
URL: http://svn.apache.org/viewvc?rev=1028613&view=rev
Log:
Check for null columns the Proper Way.
* subversion/libsvn_wc/wc_db.c
(read_info): Use svn_sqlite__column_is_null() to check for null columns.
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=1028613&r1=1028612&r2=1028613&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Oct 29 04:26:08 2010
@@ -5039,10 +5039,10 @@ read_info(svn_wc__db_status_t *status,
if (have_act)
{
*conflicted =
- svn_sqlite__column_text(stmt_act, 2, NULL) || /* old */
- svn_sqlite__column_text(stmt_act, 3, NULL) || /* new */
- svn_sqlite__column_text(stmt_act, 4, NULL) || /* working */
- svn_sqlite__column_text(stmt_act, 0, NULL); /* prop_reject */
+ !svn_sqlite__column_is_null(stmt_act, 2) || /* old */
+ !svn_sqlite__column_is_null(stmt_act, 3) || /* new */
+ !svn_sqlite__column_is_null(stmt_act, 4) || /* working */
+ !svn_sqlite__column_is_null(stmt_act, 0); /* prop_reject */
/* At the end of this function we check for tree conflicts */
}