Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit c1779e3

Browse files
peter-bpeter-b
committed
[[Cleanup]] Fix some missing-field-initializers warnings.
1 parent 2feae3d commit c1779e3

7 files changed

Lines changed: 36 additions & 34 deletions

File tree

‎engine/src/exec-busyindicator.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ MC_EXEC_DEFINE_EXEC_METHOD(BusyIndicator, StopActivityIndicator, 0)
4141

4242
static MCExecEnumTypeElementInfo _kMCBusyIndicatorElementInfo[] =
4343
{
44-
{ "in line", kMCBusyIndicatorInLine},
45-
{ "square", kMCBusyIndicatorSquare},
46-
{ "keyboard", kMCBusyIndicatorKeyboard}
44+
{ "in line", kMCBusyIndicatorInLine, false },
45+
{ "square", kMCBusyIndicatorSquare, false },
46+
{ "keyboard", kMCBusyIndicatorKeyboard, false },
4747
};
4848

4949
static MCExecEnumTypeInfo _kMCBusyIndicatorTypeInfo =
@@ -57,9 +57,9 @@ MCExecEnumTypeInfo *kMCBusyIndicatorTypeInfo = &_kMCBusyIndicatorTypeInfo;
5757

5858
static MCExecEnumTypeElementInfo _kMCActivityIndicatorElementInfo[] =
5959
{
60-
{ "white", kMCActivityIndicatorWhite },
61-
{ "large white", kMCActivityIndicatorWhiteLarge},
62-
{ "gray", kMCActivityIndicatorGray}
60+
{ "white", kMCActivityIndicatorWhite, false },
61+
{ "large white", kMCActivityIndicatorWhiteLarge, false },
62+
{ "gray", kMCActivityIndicatorGray, false },
6363
};
6464

6565
static MCExecEnumTypeInfo _kMCActivityIndicatorTypeInfo =

‎engine/src/exec-interface-control.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ static MCExecCustomTypeInfo _kMCInterfaceMarginsTypeInfo =
9696

9797
static MCExecEnumTypeElementInfo _kMCInterfaceLayerModeElementInfo[] =
9898
{
99-
{ "static", kMCLayerModeHintStatic },
100-
{ "dynamic", kMCLayerModeHintDynamic },
101-
{ "scrolling", kMCLayerModeHintScrolling },
102-
{ "container", kMCLayerModeHintContainer }
99+
{ "static", kMCLayerModeHintStatic, false },
100+
{ "dynamic", kMCLayerModeHintDynamic, false },
101+
{ "scrolling", kMCLayerModeHintScrolling, false },
102+
{ "container", kMCLayerModeHintContainer, false },
103103
};
104104

105105
static MCExecEnumTypeInfo _kMCInterfaceLayerModeTypeInfo =
@@ -410,9 +410,9 @@ void MCControl::SetShadow(MCExecContext& ctxt, const MCInterfaceShadow& p_shadow
410410

411411
static MCExecEnumTypeElementInfo _kMCInterfaceBitmapEffectBlendModeElementInfo[] =
412412
{
413-
{ "normal", kMCBitmapEffectBlendModeNormal },
414-
{ "multiply", kMCBitmapEffectBlendModeMultiply },
415-
{ "colordodge", kMCBitmapEffectBlendModeColorDodge },
413+
{ "normal", kMCBitmapEffectBlendModeNormal, false },
414+
{ "multiply", kMCBitmapEffectBlendModeMultiply, false },
415+
{ "colordodge", kMCBitmapEffectBlendModeColorDodge, false },
416416
};
417417

418418
static MCExecEnumTypeInfo _kMCInterfaceBitmapEffectBlendModeTypeInfo =
@@ -426,10 +426,10 @@ static MCExecEnumTypeInfo _kMCInterfaceBitmapEffectBlendModeTypeInfo =
426426

427427
static MCExecEnumTypeElementInfo _kMCInterfaceBitmapEffectFilterElementInfo[] =
428428
{
429-
{ "gaussian", kMCBitmapEffectFilterFastGaussian },
430-
{ "box1pass", kMCBitmapEffectFilterOnePassBox },
431-
{ "box2pass", kMCBitmapEffectFilterTwoPassBox },
432-
{ "box3pass", kMCBitmapEffectFilterThreePassBox },
429+
{ "gaussian", kMCBitmapEffectFilterFastGaussian, false },
430+
{ "box1pass", kMCBitmapEffectFilterOnePassBox, false },
431+
{ "box2pass", kMCBitmapEffectFilterTwoPassBox, false },
432+
{ "box3pass", kMCBitmapEffectFilterThreePassBox, false },
433433
};
434434

435435
static MCExecEnumTypeInfo _kMCInterfaceBitmapEffectFilterTypeInfo =
@@ -443,8 +443,8 @@ static MCExecEnumTypeInfo _kMCInterfaceBitmapEffectFilterTypeInfo =
443443

444444
static MCExecEnumTypeElementInfo _kMCInterfaceBitmapEffectSourceElementInfo[] =
445445
{
446-
{ "edge", kMCBitmapEffectSourceEdge },
447-
{ "center", kMCBitmapEffectSourceCenter },
446+
{ "edge", kMCBitmapEffectSourceEdge, false },
447+
{ "center", kMCBitmapEffectSourceCenter, false },
448448
};
449449

450450
static MCExecEnumTypeInfo _kMCInterfaceBitmapEffectSourceTypeInfo =

‎engine/src/exec-interface-field.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@ static MCExecCustomTypeInfo _kMCInterfaceFieldRangesTypeInfo =
202202

203203
static MCExecEnumTypeElementInfo _kMCInterfaceLayerModeElementInfo[] =
204204
{
205-
{ "static", kMCLayerModeHintStatic },
206-
{ "dynamic", kMCLayerModeHintDynamic },
207-
{ "scrolling", kMCLayerModeHintScrolling },
208-
{ "container", kMCLayerModeHintContainer }
205+
{ "static", kMCLayerModeHintStatic, false },
206+
{ "dynamic", kMCLayerModeHintDynamic, false },
207+
{ "scrolling", kMCLayerModeHintScrolling, false },
208+
{ "container", kMCLayerModeHintContainer, false },
209209
};
210210

211211
static MCExecEnumTypeInfo _kMCInterfaceLayerModeTypeInfo =

‎engine/src/exec.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -731,34 +731,34 @@ template<typename A, typename B, void Method(MCExecContext&, B, A)> inline void
731731
//////////
732732

733733
#define DEFINE_RW_PROPERTY(prop, type, module, tag) \
734-
{ prop, false, kMCPropertyType##type, nil, (void *)MCPropertyThunkGet##type(MC##module##Get##tag), (void *)MCPropertyThunkSet##type(MC##module##Set##tag) },
734+
{ prop, false, kMCPropertyType##type, nil, (void *)MCPropertyThunkGet##type(MC##module##Get##tag), (void *)MCPropertyThunkSet##type(MC##module##Set##tag), false, false, kMCPropertyInfoChunkTypeNone },
735735

736736
#define DEFINE_RW_SET_PROPERTY(prop, type, module, tag) \
737-
{ prop, false, kMCPropertyTypeSet, kMC##type##TypeInfo, (void *)MCPropertyThunkGetSetType(MC##module##Get##tag), (void *)MCPropertyThunkSetSetType(MC##module##Set##tag) },
737+
{ prop, false, kMCPropertyTypeSet, kMC##type##TypeInfo, (void *)MCPropertyThunkGetSetType(MC##module##Get##tag), (void *)MCPropertyThunkSetSetType(MC##module##Set##tag), false, false, kMCPropertyInfoChunkTypeNone },
738738

739739
#define DEFINE_RW_ENUM_PROPERTY(prop, type, module, tag) \
740-
{ prop, false, kMCPropertyTypeEnum, kMC##type##TypeInfo, (void *)MCPropertyThunkGetEnumType(MC##module##Get##tag), (void *)MCPropertyThunkSetEnumType(MC##module##Set##tag) },
740+
{ prop, false, kMCPropertyTypeEnum, kMC##type##TypeInfo, (void *)MCPropertyThunkGetEnumType(MC##module##Get##tag), (void *)MCPropertyThunkSetEnumType(MC##module##Set##tag), false, false, kMCPropertyInfoChunkTypeNone },
741741

742742
#define DEFINE_RW_CUSTOM_PROPERTY(prop, type, module, tag) \
743-
{ prop, false, kMCPropertyTypeCustom, kMC##type##TypeInfo, (void *)MCPropertyThunkGetCustomType(MC##module##Get##tag, MC##type), (void *)MCPropertyThunkSetCustomType(MC##module##Set##tag, MC##type) },
743+
{ prop, false, kMCPropertyTypeCustom, kMC##type##TypeInfo, (void *)MCPropertyThunkGetCustomType(MC##module##Get##tag, MC##type), (void *)MCPropertyThunkSetCustomType(MC##module##Set##tag, MC##type), false, false, kMCPropertyInfoChunkTypeNone },
744744

745745
#define DEFINE_RW_ARRAY_PROPERTY(prop, type, module, tag) \
746746
{ prop, false, kMCPropertyType##type, nil, (void *)MCPropertyThunkArrayGet##type(MC##module##Get##tag), (void *)MCPropertyThunkArraySet##type(MC##module##Set##tag), false, true, kMCPropertyInfoChunkTypeNone },
747747

748748
#define DEFINE_RO_PROPERTY(prop, type, module, tag) \
749-
{ prop, false, kMCPropertyType##type, nil, (void *)MCPropertyThunkGet##type(MC##module##Get##tag), nil },
749+
{ prop, false, kMCPropertyType##type, nil, (void *)MCPropertyThunkGet##type(MC##module##Get##tag), nil, false, false, kMCPropertyInfoChunkTypeNone },
750750

751751
#define DEFINE_RO_SET_PROPERTY(prop, type, module, tag) \
752-
{ prop, false, kMCPropertyTypeSet, kMC##type##TypeInfo, (void *)MCPropertyThunkGetSetType(MC##module##Get##tag), nil },
752+
{ prop, false, kMCPropertyTypeSet, kMC##type##TypeInfo, (void *)MCPropertyThunkGetSetType(MC##module##Get##tag), nil, false, false, kMCPropertyInfoChunkTypeNone },
753753

754754
#define DEFINE_RO_ENUM_PROPERTY(prop, type, module, tag) \
755-
{ prop, false, kMCPropertyTypeEnum, kMC##type##TypeInfo, (void *)MCPropertyThunkGetEnumType(MC##module##Get##tag), nil },
755+
{ prop, false, kMCPropertyTypeEnum, kMC##type##TypeInfo, (void *)MCPropertyThunkGetEnumType(MC##module##Get##tag), nil, false, false, kMCPropertyInfoChunkTypeNone },
756756

757757
#define DEFINE_RO_CUSTOM_PROPERTY(prop, type, module, tag) \
758-
{ prop, false, kMCPropertyTypeCustom, kMC##type##TypeInfo, (void *)MCPropertyThunkGetCustomType(MC##module##Get##tag, MC##type), nil },
758+
{ prop, false, kMCPropertyTypeCustom, kMC##type##TypeInfo, (void *)MCPropertyThunkGetCustomType(MC##module##Get##tag, MC##type), nil, false, false, kMCPropertyInfoChunkTypeNone },
759759

760760
#define DEFINE_RO_EFFECTIVE_PROPERTY(prop, type, module, tag) \
761-
{ prop, true, kMCPropertyType##type, nil, (void *)MCPropertyThunkGet##type(MC##module##GetEffective##tag), nil },
761+
{ prop, true, kMCPropertyType##type, nil, (void *)MCPropertyThunkGet##type(MC##module##GetEffective##tag), nil, false, false, kMCPropertyInfoChunkTypeNone },
762762

763763
#define DEFINE_RO_ARRAY_PROPERTY(prop, type, module, tag) \
764764
{ prop, false, kMCPropertyType##type, nil, (void *)MCPropertyThunkArrayGet##type(MC##module##Get##tag), nil, false, true, kMCPropertyInfoChunkTypeNone },

‎engine/src/paragrafattr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static struct {const char *name; Properties prop; } kMCParagraphAttrsProps[] =
6060
{"dontWrap", P_DONT_WRAP},
6161
{"padding", P_PADDING},
6262
{"listIndex", P_LIST_INDEX},
63-
{nil},
63+
{nil, P_UNDEFINED},
6464
};
6565

6666
bool MCParagraph::hasattrs(void)

‎libfoundation/include/foundation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3038,7 +3038,7 @@ struct MCPickleVariantInfo
30383038
MCPickleRecordInfo *k##Type##PickleInfo = &__##Type##_PickleImp::__info; \
30393039
MCPickleRecordFieldInfo __##Type##_PickleImp::__fields[] = {
30403040
#define MC_PICKLE_END_RECORD() \
3041-
{ kMCPickleFieldTypeNone, nil, 0 } \
3041+
{ kMCPickleFieldTypeNone, nil, 0, 0, nil } \
30423042
};
30433043

30443044
#define MC_PICKLE_BEGIN_VARIANT(Type, Kind) \

‎libfoundation/src/foundation-stream.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ static MCValueCustomCallbacks kMCStreamCustomValueCallbacks =
298298
__MCStreamEqual,
299299
__MCStreamHash,
300300
__MCStreamDescribe,
301+
nil,
302+
nil,
301303
};
302304

303305
bool MCStreamCreate(const MCStreamCallbacks *p_callbacks, size_t p_extra_bytes, MCStreamRef& r_stream)

0 commit comments

Comments
 (0)