marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wrc: Remove some more always-true conditions.

oldstable
Michael Stefaniuc 2015-01-12 12:09:38 +01:00 committed by Alexandre Julliard
parent 0e4c00a706
commit 11bee58bda
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/wrc/translation.c
View File

@ -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;