From 5ae8cf527c6c9c7315c10c46dec32030118bd1f8 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Tue, 1 Jun 2021 22:46:19 -0700 Subject: [PATCH] [cli] use `OutputPrefix()` in `Cli::Dataset` (#6699) --- src/cli/cli_dataset.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp index 85b8d1d52..4431c128b 100644 --- a/src/cli/cli_dataset.cpp +++ b/src/cli/cli_dataset.cpp @@ -85,11 +85,9 @@ otError Dataset::Print(otOperationalDataset &aDataset) if (aDataset.mComponents.mIsMeshLocalPrefixPresent) { - const uint8_t *prefix = aDataset.mMeshLocalPrefix.m8; - mInterpreter.OutputLine( - "Mesh Local Prefix: %x:%x:%x:%x::/64", (static_cast(prefix[0]) << 8) | prefix[1], - (static_cast(prefix[2]) << 8) | prefix[3], (static_cast(prefix[4]) << 8) | prefix[5], - (static_cast(prefix[6]) << 8) | prefix[7]); + mInterpreter.OutputFormat("Mesh Local Prefix: "); + mInterpreter.OutputPrefix(aDataset.mMeshLocalPrefix); + mInterpreter.OutputLine(""); } if (aDataset.mComponents.mIsMasterKeyPresent) @@ -119,7 +117,7 @@ otError Dataset::Print(otOperationalDataset &aDataset) if (aDataset.mComponents.mIsSecurityPolicyPresent) { - mInterpreter.OutputFormat("Security Policy: ", aDataset.mSecurityPolicy.mRotationTime); + mInterpreter.OutputFormat("Security Policy: "); OutputSecurityPolicy(aDataset.mSecurityPolicy); mInterpreter.OutputLine(""); } @@ -416,12 +414,9 @@ otError Dataset::ProcessMeshLocalPrefix(uint8_t aArgsLength, Arg aArgs[]) { if (sDataset.mComponents.mIsMeshLocalPrefixPresent) { - const uint8_t *prefix = sDataset.mMeshLocalPrefix.m8; - mInterpreter.OutputLine("Mesh Local Prefix: %x:%x:%x:%x::/64", - (static_cast(prefix[0]) << 8) | prefix[1], - (static_cast(prefix[2]) << 8) | prefix[3], - (static_cast(prefix[4]) << 8) | prefix[5], - (static_cast(prefix[6]) << 8) | prefix[7]); + mInterpreter.OutputFormat("Mesh Local Prefix: "); + mInterpreter.OutputPrefix(sDataset.mMeshLocalPrefix); + mInterpreter.OutputLine(""); } } else