Skip to content

Commit 3b60873

Browse files
committed
Remove no longer needed RNP_LOG_KEY_PKT.
1 parent 5f00591 commit 3b60873

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

src/lib/logging.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,6 @@ class LogStop {
8888
RNP_LOG(msg, keyid); \
8989
} while (0)
9090

91-
#define RNP_LOG_KEY_PKT(msg, key) \
92-
do { \
93-
pgp_key_id_t keyid = {}; \
94-
if (pgp_keyid(keyid, (key))) { \
95-
RNP_LOG(msg, "unknown"); \
96-
break; \
97-
}; \
98-
char keyidhex[PGP_KEY_ID_SIZE * 2 + 1] = {0}; \
99-
rnp::hex_encode( \
100-
keyid.data(), keyid.size(), keyidhex, sizeof(keyidhex), rnp::HexFormat::Lowercase); \
101-
RNP_LOG(msg, keyidhex); \
102-
} while (0)
103-
10491
#if defined(ENABLE_PQC_DBG_LOG)
10592

10693
#define RNP_LOG_FD_NO_POS_INFO(fd, ...) \

src/librekey/key_store_pgp.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ KeyStore::add_ts_subkey(const pgp_transferable_subkey_t &tskey, Key *pkey)
4848
return add_key(skey);
4949
} catch (const std::exception &e) {
5050
/* LCOV_EXCL_START */
51-
RNP_LOG("%s", e.what());
52-
RNP_LOG_KEY_PKT("failed to create subkey %s", tskey.subkey);
51+
RNP_LOG("failed to create subkey: %s", e.what());
5352
RNP_LOG_KEY("primary key is %s", pkey);
5453
return false;
5554
/* LCOV_EXCL_END */
@@ -70,7 +69,7 @@ KeyStore::add_ts_key(pgp_transferable_key_t &tkey)
7069
addkey = add_key(key);
7170
} catch (const std::exception &e) {
7271
disable_validation = false;
73-
RNP_LOG_KEY_PKT("failed to add key %s", tkey.key);
72+
RNP_LOG("failed to add key: %s", e.what());
7473
return false;
7574
}
7675

0 commit comments

Comments
 (0)