Michael Stefaniuc : wrc: Remove some more always-true conditions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 11bee58bdab1211ded89cbc80c705c6a2d60df3d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=11bee58bdab1211ded89cbc80c...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Mon Jan 12 12:09:38 2015 +0100

wrc: Remove some more always-true conditions.

---

 tools/wrc/translation.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c
index 74f2017..b7caa07 100644
--- a/tools/wrc/translation.c
+++ b/tools/wrc/translation.c
@@ -614,18 +614,16 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
 	if((ver_value1->type == ver_value2->type)) {
 		switch(ver_value1->type) {
 			case val_str:
-				if(!different && ver_value1->key && ver_value2->key)
+				if(ver_value1->key && ver_value2->key)
 					different = compare_string(ver_value1->key, ver_value2->key);
-				else if(!different &&
-					((ver_value1->key && !ver_value2->key) ||
+				else if(((ver_value1->key && !ver_value2->key) ||
 					(!ver_value1->key && ver_value2->key)))
 						different = 1;
 				break;
 			case val_words:
-				if(!different && ver_value1->key && ver_value2->key)
+				if(ver_value1->key && ver_value2->key)
 					different = compare_string(ver_value1->key, ver_value2->key);
-				else if(!different &&
-					((ver_value1->key && !ver_value2->key) ||
+				else if(((ver_value1->key && !ver_value2->key) ||
 					(!ver_value1->key && ver_value2->key)))
 						different = 1;
 				if(!different && ver_value1->value.words && ver_value2->value.words) {
@@ -644,10 +642,9 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
 						different = 1;
 				break;
 			case val_block:
-				if(!different && ver_value1->value.block && ver_value2->value.block)
+				if(ver_value1->value.block && ver_value2->value.block)
 					different = compare_ver_block(ver_value1->value.block, ver_value2->value.block);
-				else if(!different &&
-					((ver_value1->value.block && !ver_value2->value.block) ||
+				else if(((ver_value1->value.block && !ver_value2->value.block) ||
 					(!ver_value1->value.block && ver_value2->value.block)))
 						different = 1;
 				break;