RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 22-Sep-2013 19:33:44
Branch: rpm-5_4 Handle: 2013092217334400
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmtpm.c
Log:
- tpm: handle "TSS_" and "TPM_" prefixed messages; otherwise "TPM_" is
prefixed.
Summary:
Revision Changes Path
1.5.2.17 +8 -2 rpm/rpmio/rpmtpm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtpm.c
============================================================================
$ cvs diff -u -r1.5.2.16 -r1.5.2.17 rpmtpm.c
--- rpm/rpmio/rpmtpm.c 21 Sep 2013 17:54:44 -0000 1.5.2.16
+++ rpm/rpmio/rpmtpm.c 22 Sep 2013 17:33:44 -0000 1.5.2.17
@@ -39,9 +39,15 @@
(void)tpm;
(void)err;
#if defined(WITH_LIBTPM)
- if (err || _rpmtpm_debug)
- fprintf (stderr, "*** TPM_%s rc %u: %s\n", msg, rc,
+ if (err || _rpmtpm_debug) {
+ if (!strncmp(msg, "TSS_", sizeof("TSS_")-1)
+ || !strncmp(msg, "TPM_", sizeof("TPM_")-1))
+ fprintf (stderr, "*** %s rc %u: %s\n", msg, rc,
(err ? TPM_GetErrMsg(rc) : "Success"));
+ else
+ fprintf (stderr, "*** TPM_%s rc %u: %s\n", msg, rc,
+ (err ? TPM_GetErrMsg(rc) : "Success"));
+ }
#endif /* WITH_LIBTPM */
return rc;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
