| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Tue, 19 Jul 2016 15:22:15 +0200 | |
| changeset 6442 | f900f128dbb9 |
| parent 5941 | db8aa9865e9f |
| permissions | -rw-r--r-- |
|
5941
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
1 |
# Fix compiler warnings with type casting. |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
2 |
# Suitable for use upstream. |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
3 |
# This change was implemented in-house. |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
4 |
# |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
5 |
--- src/tcsd/tcsd_threads.c 2010-09-10 12:50:27.000000000 -0700 |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
6 |
+++ src/tcsd/tcsd_threads.c 2012-04-23 14:27:25.589107000 -0700 |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
7 |
@@ -185,13 +185,13 @@ |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
8 |
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
9 |
if ((rc = sigfillset(&thread_sigmask))) {
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
10 |
LogError("sigfillset failed: error=%d: %s", rc, strerror(rc));
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
11 |
- LogError("worker thread %ld is exiting prematurely", THREAD_ID);
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
12 |
+ LogError("worker thread %lu is exiting prematurely", (unsigned long)THREAD_ID);
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
13 |
THREAD_EXIT(NULL); |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
14 |
} |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
15 |
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
16 |
if ((rc = THREAD_SET_SIGNAL_MASK(SIG_BLOCK, &thread_sigmask, NULL))) {
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
17 |
LogError("Setting thread sigmask failed: error=%d: %s", rc, strerror(rc));
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
18 |
- LogError("worker thread %ld is exiting prematurely", THREAD_ID);
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
19 |
+ LogError("worker thread %lu is exiting prematurely", (unsigned long)THREAD_ID);
|
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
20 |
THREAD_EXIT(NULL); |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
21 |
} |
|
db8aa9865e9f
15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff
changeset
|
22 |
} |