From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 29 Dec 2013 14:57:33 +0000 (+0100)
Subject: sprintf format: pid_t need not be an int.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_39~21^2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5adc46d1d209237618e8f6a22cf0b1562a729fed;p=openldap

sprintf format: pid_t need not be an int.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index a7790cdd7a..a312ba4566 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -8303,13 +8303,10 @@ int mdb_reader_list(MDB_env *env, MDB_msg_func *func, void *ctx)
 	mr = env->me_txns->mti_readers;
 	for (i=0; i<rdrs; i++) {
 		if (mr[i].mr_pid) {
-			size_t tid;
-			tid = mr[i].mr_tid;
-			if (mr[i].mr_txnid == (txnid_t)-1) {
-				sprintf(buf, "%10d %"Z"x -\n", mr[i].mr_pid, tid);
-			} else {
-				sprintf(buf, "%10d %"Z"x %"Z"u\n", mr[i].mr_pid, tid, mr[i].mr_txnid);
-			}
+			txnid_t	txnid = mr[i].mr_txnid;
+			sprintf(buf, txnid == (txnid_t)-1 ?
+				"%10d %"Z"x -\n" : "%10d %"Z"x %"Z"u\n",
+				(int)mr[i].mr_pid, (size_t)mr[i].mr_tid, txnid);
 			if (first) {
 				first = 0;
 				rc = func("    pid     thread     txnid\n", ctx);