Skip to content

Commit 3a3f3a4

Browse files
generatedunixname89002005287564facebook-github-bot
generatedunixname89002005287564
authored and
facebook-github-bot
committed
Fix CQS signal readability-implicit-bool-conversion in xplat/js/react-native-github/packages [B] (#53611)
Summary: Pull Request resolved: #53611 Reviewed By: rshest Differential Revision: D81699709 fbshipit-source-id: 6f512fcc01e3f1d33b4e94c4766ee3ab759463e5
1 parent 71edbe1 commit 3a3f3a4

9 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
std::vector<const RCTMethodInfo *> methodInfos;
5252

5353
Class cls = moduleClass;
54-
while (cls && cls != [NSObject class] && cls != [NSProxy class]) {
54+
while ((cls != nullptr) && cls != [NSObject class] && cls != [NSProxy class]) {
5555
unsigned int methodCount;
5656
Method *methods = class_copyMethodList(object_getClass(cls), &methodCount);
5757

@@ -482,7 +482,7 @@ T RCTConvertTo(SEL selector, id json)
482482
return;
483483
}
484484

485-
if (arg) {
485+
if (arg != nullptr) {
486486
[retainedObjectsForInvocation addObject:arg];
487487
}
488488
[inv setArgument:&arg atIndex:(index) + 2];
@@ -496,7 +496,7 @@ T RCTConvertTo(SEL selector, id json)
496496
typeInvocation.target = [RCTConvert class];
497497

498498
void *returnValue = malloc(typeSignature.methodReturnLength);
499-
if (!returnValue) {
499+
if (returnValue == nullptr) {
500500
// CWE - 391 : Unchecked error condition
501501
// https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
502502
// https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
@@ -519,7 +519,7 @@ T RCTConvertTo(SEL selector, id json)
519519
* RCTModuleMethod doesn't actually call into RCTConvert in this case.
520520
*/
521521
id arg = [objCArg copy];
522-
if (arg) {
522+
if (arg != nullptr) {
523523
[retainedObjectsForInvocation addObject:arg];
524524
}
525525
[inv setArgument:&arg atIndex:(index) + 2];
@@ -537,7 +537,7 @@ T RCTConvertTo(SEL selector, id json)
537537

538538
RCTResponseSenderBlock arg =
539539
(RCTResponseSenderBlock)TurboModuleConvertUtils::convertJSIValueToObjCObject(runtime, jsiArg, jsInvoker_, YES);
540-
if (arg) {
540+
if (arg != nullptr) {
541541
[retainedObjectsForInvocation addObject:arg];
542542
}
543543
[inv setArgument:&arg atIndex:(index) + 2];

‎packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static int32_t getUniqueId()
5959

6060
static jsi::String convertNSStringToJSIString(jsi::Runtime &runtime, NSString *value)
6161
{
62-
return jsi::String::createFromUtf8(runtime, [value UTF8String] ? [value UTF8String] : "");
62+
return jsi::String::createFromUtf8(runtime, ([value UTF8String] != nullptr) ? [value UTF8String] : "");
6363
}
6464

6565
static jsi::Object convertNSDictionaryToJSIObject(jsi::Runtime &runtime, NSDictionary *value)
@@ -124,7 +124,7 @@ static int32_t getUniqueId()
124124
for (size_t i = 0; i < size; i++) {
125125
// Insert kCFNull when it's `undefined` value to preserve the indices.
126126
id convertedObject = convertJSIValueToObjCObject(runtime, value.getValueAtIndex(runtime, i), jsInvoker, useNSNull);
127-
[result addObject:convertedObject ? convertedObject : (id)kCFNull];
127+
[result addObject:(convertedObject != nullptr) ? convertedObject : (id)kCFNull];
128128
}
129129
return result;
130130
}
@@ -142,7 +142,7 @@ static int32_t getUniqueId()
142142
jsi::String name = propertyNames.getValueAtIndex(runtime, i).getString(runtime);
143143
NSString *k = convertJSIStringToNSString(runtime, name);
144144
id v = convertJSIValueToObjCObject(runtime, value.getProperty(runtime, name), jsInvoker, useNSNull);
145-
if (v) {
145+
if (v != nullptr) {
146146
result[k] = v;
147147
}
148148
}
@@ -252,7 +252,7 @@ id convertJSIValueToObjCObject(
252252
jsi::Value
253253
ObjCTurboModule::createPromise(jsi::Runtime &runtime, const std::string &methodName, PromiseInvocationBlock invoke)
254254
{
255-
if (!invoke) {
255+
if (invoke == nullptr) {
256256
return jsi::Value::undefined();
257257
}
258258

@@ -388,7 +388,7 @@ id convertJSIValueToObjCObject(
388388

389389
void (^block)() = ^{
390390
id<RCTBridgeModule> strongModule = weakModule;
391-
if (!strongModule) {
391+
if (strongModule == nullptr) {
392392
return;
393393
}
394394

@@ -457,7 +457,7 @@ TraceSection s(
457457

458458
void (^block)() = ^{
459459
id<RCTBridgeModule> strongModule = weakModule;
460-
if (!strongModule) {
460+
if (strongModule == nullptr) {
461461
return;
462462
}
463463

@@ -560,14 +560,14 @@ TraceSection s(
560560
*/
561561
NSString *ObjCTurboModule::getArgumentTypeName(jsi::Runtime &runtime, NSString *methodName, int argIndex)
562562
{
563-
if (!methodArgumentTypeNames_) {
563+
if (methodArgumentTypeNames_ == nullptr) {
564564
NSMutableDictionary<NSString *, NSArray<NSString *> *> *methodArgumentTypeNames = [NSMutableDictionary new];
565565

566566
unsigned int numberOfMethods;
567567
Class cls = [instance_ class];
568568
Method *methods = class_copyMethodList(object_getClass(cls), &numberOfMethods);
569569

570-
if (methods) {
570+
if (methods != nullptr) {
571571
for (unsigned int i = 0; i < numberOfMethods; i++) {
572572
SEL s = method_getName(methods[i]);
573573
NSString *mName = NSStringFromSelector(s);
@@ -597,7 +597,7 @@ TraceSection s(
597597
methodArgumentTypeNames_ = methodArgumentTypeNames;
598598
}
599599

600-
if (methodArgumentTypeNames_[methodName]) {
600+
if (methodArgumentTypeNames_[methodName] != nullptr) {
601601
assert([methodArgumentTypeNames_[methodName] count] > argIndex);
602602
return methodArgumentTypeNames_[methodName][argIndex];
603603
}
@@ -656,7 +656,7 @@ TraceSection s(
656656
*/
657657
BOOL enableModuleArgumentNSNullConversionIOS = ReactNativeFeatureFlags::enableModuleArgumentNSNullConversionIOS();
658658
id objCArg = convertJSIValueToObjCObject(runtime, arg, jsInvoker_, enableModuleArgumentNSNullConversionIOS);
659-
if (objCArg) {
659+
if (objCArg != nullptr) {
660660
NSString *methodNameNSString = @(methodName);
661661

662662
/**
@@ -678,7 +678,7 @@ TraceSection s(
678678
}
679679

680680
[inv setArgument:(void *)&convertedObjCArg atIndex:i + 2];
681-
if (convertedObjCArg) {
681+
if (convertedObjCArg != nullptr) {
682682
[retainedObjectsForInvocation addObject:convertedObjCArg];
683683
}
684684
return;
@@ -708,7 +708,7 @@ TraceSection s(
708708
* Insert converted args unmodified.
709709
*/
710710
[inv setArgument:(void *)&objCArg atIndex:i + 2];
711-
if (objCArg) {
711+
if (objCArg != nullptr) {
712712
[retainedObjectsForInvocation addObject:objCArg];
713713
}
714714
}
@@ -848,7 +848,7 @@ TraceSection s(
848848

849849
BOOL ObjCTurboModule::hasMethodArgConversionSelector(NSString *methodName, size_t argIndex)
850850
{
851-
return methodArgConversionSelectors_ && methodArgConversionSelectors_[methodName] &&
851+
return (methodArgConversionSelectors_ != nullptr) && (methodArgConversionSelectors_[methodName] != nullptr) &&
852852
![methodArgConversionSelectors_[methodName][argIndex] isEqual:(id)kCFNull];
853853
}
854854

@@ -860,11 +860,11 @@ TraceSection s(
860860

861861
void ObjCTurboModule::setMethodArgConversionSelector(NSString *methodName, size_t argIndex, NSString *fnName)
862862
{
863-
if (!methodArgConversionSelectors_) {
863+
if (methodArgConversionSelectors_ == nullptr) {
864864
methodArgConversionSelectors_ = [NSMutableDictionary new];
865865
}
866866

867-
if (!methodArgConversionSelectors_[methodName]) {
867+
if (methodArgConversionSelectors_[methodName] == nullptr) {
868868
auto metaData = methodMap_.at([methodName UTF8String]);
869869
auto argCount = metaData.argCount;
870870

‎packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleLegacyModule.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ - (NSDictionary *)constantsToExport
136136
{
137137
return @{
138138
@"x" : @(x),
139-
@"y" : y ? y : [NSNull null],
140-
@"z" : z ? z : [NSNull null],
139+
@"y" : (y != nullptr) ? y : [NSNull null],
140+
@"z" : (z != nullptr) ? z : [NSNull null],
141141
};
142142
}
143143

144144
RCT_EXPORT_METHOD(getValueWithCallback : (RCTResponseSenderBlock)callback)
145145
{
146-
if (!callback) {
146+
if (callback == nullptr) {
147147
return;
148148
}
149149
callback(@[ @"value from callback!" ]);
@@ -154,7 +154,7 @@ - (NSDictionary *)constantsToExport
154154
: (RCTPromiseResolveBlock)resolve reject
155155
: (RCTPromiseRejectBlock)reject)
156156
{
157-
if (!resolve || !reject) {
157+
if ((resolve == nullptr) || (reject == nullptr)) {
158158
return;
159159
}
160160

‎packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ - (void)installJSIBindingsWithRuntime:(facebook::jsi::Runtime &)runtime
136136
{
137137
return @{
138138
@"x" : @(x),
139-
@"y" : y ? y : [NSNull null],
140-
@"z" : z ? z : [NSNull null],
139+
@"y" : (y != nullptr) ? y : [NSNull null],
140+
@"z" : (z != nullptr) ? z : [NSNull null],
141141
};
142142
}
143143

144144
RCT_EXPORT_METHOD(getValueWithCallback : (RCTResponseSenderBlock)callback)
145145
{
146-
if (!callback) {
146+
if (callback == nullptr) {
147147
return;
148148
}
149149
callback(@[ @"value from callback!" ]);
@@ -154,7 +154,7 @@ - (void)installJSIBindingsWithRuntime:(facebook::jsi::Runtime &)runtime
154154
: (RCTPromiseResolveBlock)resolve reject
155155
: (RCTPromiseRejectBlock)reject)
156156
{
157-
if (!resolve || !reject) {
157+
if ((resolve == nullptr) || (reject == nullptr)) {
158158
return;
159159
}
160160

‎packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -402,79 +402,79 @@ inline void fromRawValue(
402402
inline std::string toString(const FontVariant& fontVariant) {
403403
auto result = std::string{};
404404
auto separator = std::string{", "};
405-
if ((int)fontVariant & (int)FontVariant::SmallCaps) {
405+
if (((int)fontVariant & (int)FontVariant::SmallCaps) != 0) {
406406
result += "small-caps" + separator;
407407
}
408-
if ((int)fontVariant & (int)FontVariant::OldstyleNums) {
408+
if (((int)fontVariant & (int)FontVariant::OldstyleNums) != 0) {
409409
result += "oldstyle-nums" + separator;
410410
}
411-
if ((int)fontVariant & (int)FontVariant::LiningNums) {
411+
if (((int)fontVariant & (int)FontVariant::LiningNums) != 0) {
412412
result += "lining-nums" + separator;
413413
}
414-
if ((int)fontVariant & (int)FontVariant::TabularNums) {
414+
if (((int)fontVariant & (int)FontVariant::TabularNums) != 0) {
415415
result += "tabular-nums" + separator;
416416
}
417-
if ((int)fontVariant & (int)FontVariant::ProportionalNums) {
417+
if (((int)fontVariant & (int)FontVariant::ProportionalNums) != 0) {
418418
result += "proportional-nums" + separator;
419419
}
420-
if ((int)fontVariant & (int)FontVariant::StylisticOne) {
420+
if (((int)fontVariant & (int)FontVariant::StylisticOne) != 0) {
421421
result += "stylistic-one" + separator;
422422
}
423-
if ((int)fontVariant & (int)FontVariant::StylisticTwo) {
423+
if (((int)fontVariant & (int)FontVariant::StylisticTwo) != 0) {
424424
result += "stylistic-two" + separator;
425425
}
426-
if ((int)fontVariant & (int)FontVariant::StylisticThree) {
426+
if (((int)fontVariant & (int)FontVariant::StylisticThree) != 0) {
427427
result += "stylistic-three" + separator;
428428
}
429-
if ((int)fontVariant & (int)FontVariant::StylisticFour) {
429+
if (((int)fontVariant & (int)FontVariant::StylisticFour) != 0) {
430430
result += "stylistic-four" + separator;
431431
}
432-
if ((int)fontVariant & (int)FontVariant::StylisticFive) {
432+
if (((int)fontVariant & (int)FontVariant::StylisticFive) != 0) {
433433
result += "stylistic-five" + separator;
434434
}
435-
if ((int)fontVariant & (int)FontVariant::StylisticSix) {
435+
if (((int)fontVariant & (int)FontVariant::StylisticSix) != 0) {
436436
result += "stylistic-six" + separator;
437437
}
438-
if ((int)fontVariant & (int)FontVariant::StylisticSeven) {
438+
if (((int)fontVariant & (int)FontVariant::StylisticSeven) != 0) {
439439
result += "stylistic-seven" + separator;
440440
}
441-
if ((int)fontVariant & (int)FontVariant::StylisticEight) {
441+
if (((int)fontVariant & (int)FontVariant::StylisticEight) != 0) {
442442
result += "stylistic-eight" + separator;
443443
}
444-
if ((int)fontVariant & (int)FontVariant::StylisticNine) {
444+
if (((int)fontVariant & (int)FontVariant::StylisticNine) != 0) {
445445
result += "stylistic-nine" + separator;
446446
}
447-
if ((int)fontVariant & (int)FontVariant::StylisticTen) {
447+
if (((int)fontVariant & (int)FontVariant::StylisticTen) != 0) {
448448
result += "stylistic-ten" + separator;
449449
}
450-
if ((int)fontVariant & (int)FontVariant::StylisticEleven) {
450+
if (((int)fontVariant & (int)FontVariant::StylisticEleven) != 0) {
451451
result += "stylistic-eleven" + separator;
452452
}
453-
if ((int)fontVariant & (int)FontVariant::StylisticTwelve) {
453+
if (((int)fontVariant & (int)FontVariant::StylisticTwelve) != 0) {
454454
result += "stylistic-twelve" + separator;
455455
}
456-
if ((int)fontVariant & (int)FontVariant::StylisticThirteen) {
456+
if (((int)fontVariant & (int)FontVariant::StylisticThirteen) != 0) {
457457
result += "stylistic-thirteen" + separator;
458458
}
459-
if ((int)fontVariant & (int)FontVariant::StylisticFourteen) {
459+
if (((int)fontVariant & (int)FontVariant::StylisticFourteen) != 0) {
460460
result += "stylistic-fourteen" + separator;
461461
}
462-
if ((int)fontVariant & (int)FontVariant::StylisticFifteen) {
462+
if (((int)fontVariant & (int)FontVariant::StylisticFifteen) != 0) {
463463
result += "stylistic-fifteen" + separator;
464464
}
465-
if ((int)fontVariant & (int)FontVariant::StylisticSixteen) {
465+
if (((int)fontVariant & (int)FontVariant::StylisticSixteen) != 0) {
466466
result += "stylistic-sixteen" + separator;
467467
}
468-
if ((int)fontVariant & (int)FontVariant::StylisticSeventeen) {
468+
if (((int)fontVariant & (int)FontVariant::StylisticSeventeen) != 0) {
469469
result += "stylistic-seventeen" + separator;
470470
}
471-
if ((int)fontVariant & (int)FontVariant::StylisticEighteen) {
471+
if (((int)fontVariant & (int)FontVariant::StylisticEighteen) != 0) {
472472
result += "stylistic-eighteen" + separator;
473473
}
474-
if ((int)fontVariant & (int)FontVariant::StylisticNineteen) {
474+
if (((int)fontVariant & (int)FontVariant::StylisticNineteen) != 0) {
475475
result += "stylistic-nineteen" + separator;
476476
}
477-
if ((int)fontVariant & (int)FontVariant::StylisticTwenty) {
477+
if (((int)fontVariant & (int)FontVariant::StylisticTwenty) != 0) {
478478
result += "stylistic-twenty" + separator;
479479
}
480480

‎packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ static Class getViewManagerFromComponentName(const std::string &componentName)
6363
// 1. Try to get the manager with the RCT prefix.
6464
auto rctViewManagerName = "RCT" + viewManagerName;
6565
Class viewManagerClass = NSClassFromString(RCTNSStringFromString(rctViewManagerName));
66-
if (viewManagerClass) {
66+
if (viewManagerClass != nullptr) {
6767
return viewManagerClass;
6868
}
6969

7070
// 2. Try to get the manager without the prefix.
7171
viewManagerClass = NSClassFromString(RCTNSStringFromString(viewManagerName));
72-
if (viewManagerClass) {
72+
if (viewManagerClass != nullptr) {
7373
return viewManagerClass;
7474
}
7575

‎packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class AndroidTextInputComponentDescriptor final
5454
->getMethod<jboolean(jint, jfloatArray)>("getThemeData");
5555

5656
if (getThemeData(
57-
fabricUIManager, surfaceId, defaultTextInputPaddingArray)) {
57+
fabricUIManager, surfaceId, defaultTextInputPaddingArray) != 0u) {
5858
jfloat* defaultTextInputPadding =
5959
env->GetFloatArrayElements(defaultTextInputPaddingArray, nullptr);
6060
theme.start = defaultTextInputPadding[0];

‎packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)
2929

3030
if (CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelRGB) {
3131
CFStringRef name = CGColorSpaceGetName(colorSpace);
32-
if (name != NULL && CFEqual(name, kCGColorSpaceDisplayP3)) {
32+
if (name != NULL && (CFEqual(name, kCGColorSpaceDisplayP3) != 0u)) {
3333
return true;
3434
}
3535
}
@@ -105,7 +105,7 @@ uint32_t ColorFromUIColorForSpecificTraitCollection(
105105
UITraitCollection *traitCollection)
106106
{
107107
UIColor *color = (UIColor *)unwrapManagedObject(uiColor);
108-
if (color) {
108+
if (color != nullptr) {
109109
color = [color resolvedColorWithTraitCollection:traitCollection];
110110
return ColorFromUIColor(color);
111111
}
@@ -199,7 +199,7 @@ uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
199199
Color::Color(std::shared_ptr<void> uiColor)
200200
{
201201
UIColor *color = ((UIColor *)unwrapManagedObject(uiColor));
202-
if (color) {
202+
if (color != nullptr) {
203203
auto colorHash = hashFromUIColor(uiColor);
204204
uiColorHashValue_ = colorHash;
205205
}

0 commit comments

Comments
 (0)