mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
|
Title: Fix boolean comparison error (and FTBFS with gcc-5)
|
||
|
|
Date: 2015-06-28
|
||
|
|
Author: Pierre Chifflier <pollux@debian.org>
|
||
|
|
Bug-Debian: http://bugs.debian.org/778147
|
||
|
|
Index: tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
|
||
|
|
===================================================================
|
||
|
|
--- tpm-tools.orig/src/tpm_mgmt/tpm_nvcommon.c
|
||
|
|
+++ tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
|
||
|
|
@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA
|
||
|
|
aArg);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
- if (!aArg[offset+numbytes] == '|' &&
|
||
|
|
- !aArg[offset+numbytes] == 0) {
|
||
|
|
+ if (!(aArg[offset+numbytes] == '|' ||
|
||
|
|
+ aArg[offset+numbytes] == 0)) {
|
||
|
|
logError(_("Illegal character following "
|
||
|
|
"hexadecimal number in %s\n"),
|
||
|
|
aArg + offset);
|
||
|
|
@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!aArg[offset+numbytes] == '|' &&
|
||
|
|
- !aArg[offset+numbytes] == 0) {
|
||
|
|
+ if (!(aArg[offset+numbytes] == '|' ||
|
||
|
|
+ aArg[offset+numbytes] == 0)) {
|
||
|
|
logError(_("Illegal character following decimal "
|
||
|
|
"number in %s\n"),
|
||
|
|
aArg + offset);
|