[cig-commits] r5138 - in long/3D/Gale/trunk/src/StGermain: .
Base/Automation/src
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 13:30:05 PST 2006
Author: walter
Date: 2006-10-31 13:30:04 -0800 (Tue, 31 Oct 2006)
New Revision: 5138
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable_Register.c
Log:
r3124 at earth: boo | 2006-10-31 13:26:15 -0800
r3102 at earth (orig r3879): KathleenHumble | 2006-10-25 18:32:33 -0700
removing check or varIndex < 0 in Journal_DFirewall statement
in Variable_Register.c
as varIndex is defined as a Variable_Index which is of type Index,
and that is of type unsigned int, so it's defined to
be always greater than or equal to zero, and if given
a negative number, will convert to to a large int. which
is taken care of by the second part of the check.
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3123
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3878
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3124
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3879
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable_Register.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable_Register.c 2006-10-31 21:30:01 UTC (rev 5137)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable_Register.c 2006-10-31 21:30:04 UTC (rev 5138)
@@ -259,7 +259,7 @@
#if DEBUG
Stream* error = Journal_Register( ErrorStream_Type, self->type );
- Journal_DFirewall( ((varIndex >= 0) && (varIndex < self->count)), error,
+ Journal_DFirewall( (varIndex < self->count), error,
"Error: Given variable index %d not between 0 and variable count %d.\n",
varIndex, self->count );
#endif
More information about the cig-commits
mailing list