diff options
| author | mutantmonkey | 2017-06-10 15:14:41 -0700 |
|---|---|---|
| committer | mutantmonkey | 2017-06-10 15:14:41 -0700 |
| commit | bcdeed38e04612391e5a924ee5d148ea1d6c92a2 (patch) | |
| tree | 7336cb114328eeaa0294f1768a234f694d880644 /03-fix-bool-error-parseStringWithValues.patch | |
| parent | 9657c519e75a7e5cc988785ad6c1478c6976a486 (diff) | |
| download | aur-bcdeed38e04612391e5a924ee5d148ea1d6c92a2.tar.gz | |
upgpkg: tpm-tools 1.3.9.1-2
Apply patch from Gerardo Exequiel Pozzi <djgera@archlinux.org>
Diffstat (limited to '03-fix-bool-error-parseStringWithValues.patch')
| -rw-r--r-- | 03-fix-bool-error-parseStringWithValues.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/03-fix-bool-error-parseStringWithValues.patch b/03-fix-bool-error-parseStringWithValues.patch new file mode 100644 index 000000000000..482d40c8c26b --- /dev/null +++ b/03-fix-bool-error-parseStringWithValues.patch @@ -0,0 +1,32 @@ +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 +--- + src/tpm_mgmt/tpm_nvcommon.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/src/tpm_mgmt/tpm_nvcommon.c ++++ b/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); |