Skip to content

Commit 14b5250

Browse files
use PRIu32 instead of %d
1 parent 320301d commit 14b5250

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

lldb/source/DataFormatters/VectorType.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ class VectorTypeSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
276276
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
277277
return llvm::createStringError(
278278
"'SyntheticChildrenFrontEnd::VectorTypeSyntheticFrontEnd' cannot "
279-
"find index of child '%s'",
280-
name.AsCString());
279+
"find index of child '%s'. (idx='" PRIu32 "')",
280+
name.AsCString(), idx);
281281
return idx;
282282
}
283283

lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
129129
if (!m_start || !m_finish)
130130
return llvm::createStringError(
131131
"'SyntheticChildrenFrontEnd::LibcxxStdValarraySyntheticFrontEnd' "
132-
"cannot find index of child '%s'. (m_start='%d', m_finish='%d')",
132+
"cannot find index of child '%s'. (m_start='" PRIu32
133+
"', m_finish='" PRIu32 "')",
133134
name.AsCString(), m_start, m_finish);
134135
size_t idx = ExtractIndexFromString(name.GetCString());
135136
if (idx == UINT32_MAX) {

lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
169169
if (!m_start || !m_finish)
170170
return llvm::createStringError(
171171
"'SyntheticChildrenFrontEnd::LibcxxStdVectorSyntheticFrontEnd' cannot "
172-
"find index of child '%s'. (m_start='%d', m_finish='%d')",
172+
"find index of child '%s'. (m_start='" PRIu32 "', m_finish='" PRIu32
173+
"')",
173174
name.AsCString(), m_start, m_finish);
174175
size_t index = formatters::ExtractIndexFromString(name.GetCString());
175176
if (index == UINT32_MAX) {
@@ -277,16 +278,17 @@ lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
277278
if (!m_count || !m_base_data_address)
278279
return llvm::createStringError(
279280
"'SyntheticChildrenFrontEnd::LibcxxVectorBoolSyntheticFrontEnd' cannot "
280-
"find index of child '%s'. (m_count='%d', m_base_data_address='%d')",
281+
"find index of child '%s'. (m_count='" PRIu32
282+
"', m_base_data_address='" PRIu32 "')",
281283
name.AsCString(), m_count, m_base_data_address);
282284
const char *item_name = name.GetCString();
283285
uint32_t idx = ExtractIndexFromString(item_name);
284286
if (idx == UINT32_MAX ||
285287
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
286288
return llvm::createStringError(
287289
"'SyntheticChildrenFrontEnd::LibcxxVectorBoolSyntheticFrontEnd' cannot "
288-
"find index of child '%s'",
289-
name.AsCString());
290+
"find index of child '%s'. (idx='" PRIu32 "')",
291+
name.AsCString(), idx);
290292
return idx;
291293
}
292294

lldb/source/Plugins/Language/ObjC/NSArray.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ llvm::Expected<size_t> lldb_private::formatters::NSArrayMSyntheticFrontEndBase::
534534
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
535535
return llvm::createStringError(
536536
"'SyntheticChildrenFrontend::NSArrayMSyntheticFrontEndBase' cannot "
537-
"find index of child '%s'. (idx='%d')",
537+
"find index of child '%s'. (idx='" PRIu32 "')",
538538
name.AsCString(), idx);
539539
return idx;
540540
}
@@ -624,7 +624,7 @@ lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<
624624
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
625625
return llvm::createStringError(
626626
"'SyntheticChildrenFrontEnd::ObjCClassSyntheticChildrenFrontEnd' "
627-
"cannot find index of child '%s'. (idx='%d')",
627+
"cannot find index of child '%s'. (idx='" PRIu32 "')",
628628
name.AsCString(), idx);
629629
return idx;
630630
}

lldb/source/Plugins/Language/ObjC/NSDictionary.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ llvm::Expected<size_t> lldb_private::formatters::
593593
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
594594
return llvm::createStringError(
595595
"'SyntheticChildrenFrontEnd::NSDictionaryISyntheticFrontEnd' cannot "
596-
"find index of child '%s'. (idx='%d')",
596+
"find index of child '%s'. (idx='" PRIu32 "')",
597597
name.AsCString(), idx);
598598
return idx;
599599
}
@@ -730,7 +730,7 @@ llvm::Expected<size_t> lldb_private::formatters::
730730
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
731731
return llvm::createStringError(
732732
"'SyntheticChildrenFrontEnd::NSCFDictionarySyntheticFrontEnd' cannot "
733-
"find index of child '%s'. (idx='%d')",
733+
"find index of child '%s'. (idx='" PRIu32 "')",
734734
name.AsCString(), idx);
735735
return idx;
736736
}
@@ -866,7 +866,7 @@ lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
866866
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
867867
return llvm::createStringError(
868868
"'SyntheticChildrenFrontEnd::NSConstantDictionarySyntheticFrontEnd' "
869-
"cannot find index of child '%s'. (idx='%d')",
869+
"cannot find index of child '%s'. (idx='" PRIu32 "')",
870870
name.AsCString(), idx);
871871
return idx;
872872
}
@@ -1072,7 +1072,7 @@ lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
10721072
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
10731073
return llvm::createStringError(
10741074
"'SyntheticChildrenFrontEnd::GenericNSDictionaryMSyntheticFrontEnd' "
1075-
"cannot find index of child '%s'. (idx='%d')",
1075+
"cannot find index of child '%s'. (idx='" PRIu32 "')",
10761076
name.AsCString(), idx);
10771077
return idx;
10781078
}
@@ -1233,7 +1233,7 @@ llvm::Expected<size_t> lldb_private::formatters::Foundation1100::
12331233
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
12341234
return llvm::createStringError(
12351235
"'SyntheticChildrenFrontEnd::NSDictionaryMSyntheticFrontEnd' cannot "
1236-
"find index of child '%s'. (idx='%d')",
1236+
"find index of child '%s'. (idx='" PRIu32 "')",
12371237
name.AsCString(), idx);
12381238
return idx;
12391239
}

lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class NSIndexPathSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
133133
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
134134
return llvm::createStringError(
135135
"'SyntheticChildrenFrontEnd::NSIndexPathSyntheticFrontEnd' cannot "
136-
"find index of child '%s'. (idx='%d')",
136+
"find index of child '%s'. (idx='" PRIu32 "')",
137137
name.AsCString(), idx);
138138
return idx;
139139
}

lldb/source/Plugins/Language/ObjC/NSSet.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetIndexOfChildWithName(
395395
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
396396
return llvm::createStringError(
397397
"'SyntheticChildrenFrontEnd::NSSetISyntheticFrontEnd' cannot find "
398-
"index of child '%s'. (idx='%d')",
398+
"index of child '%s'. (idx='" PRIu32 "')",
399399
name.AsCString(), idx);
400400
return idx;
401401
}
@@ -532,7 +532,7 @@ lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetIndexOfChildWithName(
532532
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
533533
return llvm::createStringError(
534534
"'SyntheticChildrenFrontEnd::NSCFSetSyntheticFrontEnd' cannot find "
535-
"index of child '%s'. (idx='%d')",
535+
"index of child '%s'. (idx='" PRIu32 "')",
536536
name.AsCString(), idx);
537537
return idx;
538538
}
@@ -670,7 +670,7 @@ llvm::Expected<size_t> lldb_private::formatters::GenericNSSetMSyntheticFrontEnd<
670670
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
671671
return llvm::createStringError(
672672
"'SyntheticChildrenFrontEnd::GenericNSSetMSyntheticFrontEnd' cannot "
673-
"find index of child '%s'. (idx='%d')",
673+
"find index of child '%s'. (idx='" PRIu32 "')",
674674
name.AsCString(), idx);
675675
return idx;
676676
}

0 commit comments

Comments
 (0)