diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm index 8a89672bb8f3..469e73182ae2 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm @@ -54,7 +54,7 @@ void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled) NSArray *RCTAppSetupUnstableModulesRequiringMainQueueSetup(id dependencyProvider) { // For oss, insert core main queue setup modules here - return dependencyProvider ? dependencyProvider.unstableModulesRequiringMainQueueSetup : @[]; + return (dependencyProvider != nullptr) ? dependencyProvider.unstableModulesRequiringMainQueueSetup : @[]; } id RCTAppSetupDefaultModuleFromClass(Class moduleClass, id dependencyProvider) @@ -65,11 +65,11 @@ void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled) NSArray *classNames = @[]; if (protocol == @protocol(RCTImageURLLoader)) { - classNames = dependencyProvider ? dependencyProvider.imageURLLoaderClassNames : @[]; + classNames = (dependencyProvider != nullptr) ? dependencyProvider.imageURLLoaderClassNames : @[]; } else if (protocol == @protocol(RCTImageDataDecoder)) { - classNames = dependencyProvider ? dependencyProvider.imageDataDecoderClassNames : @[]; + classNames = (dependencyProvider != nullptr) ? dependencyProvider.imageDataDecoderClassNames : @[]; } else if (protocol == @protocol(RCTURLRequestHandler)) { - classNames = dependencyProvider ? dependencyProvider.URLRequestHandlerClassNames : @[]; + classNames = (dependencyProvider != nullptr) ? dependencyProvider.URLRequestHandlerClassNames : @[]; } NSMutableArray *modules = [NSMutableArray new]; diff --git a/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm index 07562f178eb8..3b917c1a05cc 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm @@ -78,7 +78,7 @@ - (NSURL *_Nullable)bundleURL - (NSDictionary> *)thirdPartyFabricComponents { - return self.dependencyProvider ? self.dependencyProvider.thirdPartyFabricComponents : @{}; + return (self.dependencyProvider != nullptr) ? self.dependencyProvider.thirdPartyFabricComponents : @{}; } - (void)hostDidStart:(RCTHost *)host @@ -87,13 +87,15 @@ - (void)hostDidStart:(RCTHost *)host - (NSArray *)unstableModulesRequiringMainQueueSetup { - return self.dependencyProvider ? RCTAppSetupUnstableModulesRequiringMainQueueSetup(self.dependencyProvider) : @[]; + return (self.dependencyProvider != nullptr) + ? RCTAppSetupUnstableModulesRequiringMainQueueSetup(self.dependencyProvider) + : @[]; } - (nullable id)getModuleProvider:(const char *)name { NSString *providerName = [NSString stringWithCString:name encoding:NSUTF8StringEncoding]; - return self.dependencyProvider ? self.dependencyProvider.moduleProviders[providerName] : nullptr; + return (self.dependencyProvider != nullptr) ? self.dependencyProvider.moduleProviders[providerName] : nullptr; } - (std::shared_ptr)getTurboModule:(const std::string &)name diff --git a/packages/react-native/Libraries/Blob/RCTBlobCollector.mm b/packages/react-native/Libraries/Blob/RCTBlobCollector.mm index 9028e089b411..61927afa2ee3 100644 --- a/packages/react-native/Libraries/Blob/RCTBlobCollector.mm +++ b/packages/react-native/Libraries/Blob/RCTBlobCollector.mm @@ -31,7 +31,7 @@ __weak RCTCxxBridge *cxxBridge = (RCTCxxBridge *)blobManager.bridge; [cxxBridge dispatchBlock:^{ - if (!cxxBridge || cxxBridge.runtime == nullptr) { + if ((cxxBridge == nullptr) || cxxBridge.runtime == nullptr) { return; } jsi::Runtime &runtime = *(jsi::Runtime *)cxxBridge.runtime; diff --git a/packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm b/packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm index f412e9b74c10..538bf842fcf1 100644 --- a/packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm +++ b/packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm @@ -50,8 +50,8 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL completionHandler:(RCTImageLoaderCompletionBlock)completionHandler { UIImage *image = RCTImageFromLocalAssetURL(imageURL); - if (image) { - if (progressHandler) { + if (image != nullptr) { + if (progressHandler != nullptr) { progressHandler(1, 1); } completionHandler(nil, image); diff --git a/packages/react-native/Libraries/Image/RCTGIFImageDecoder.mm b/packages/react-native/Libraries/Image/RCTGIFImageDecoder.mm index ca66cda7eb02..92628c6c8f26 100644 --- a/packages/react-native/Libraries/Image/RCTGIFImageDecoder.mm +++ b/packages/react-native/Libraries/Image/RCTGIFImageDecoder.mm @@ -27,7 +27,7 @@ - (BOOL)canDecodeImageData:(NSData *)imageData char header[7] = {}; [imageData getBytes:header length:6]; - return !strcmp(header, "GIF87a") || !strcmp(header, "GIF89a"); + return (strcmp(header, "GIF87a") == 0) || (strcmp(header, "GIF89a") == 0); } - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData @@ -38,7 +38,7 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData { RCTAnimatedImage *image = [[RCTAnimatedImage alloc] initWithData:imageData scale:scale]; - if (!image) { + if (image == nullptr) { completionHandler(nil, nil); return ^{ }; diff --git a/packages/react-native/Libraries/Image/RCTImageBlurUtils.mm b/packages/react-native/Libraries/Image/RCTImageBlurUtils.mm index e5a17309473b..df9fa1d9a145 100644 --- a/packages/react-native/Libraries/Image/RCTImageBlurUtils.mm +++ b/packages/react-native/Libraries/Image/RCTImageBlurUtils.mm @@ -19,7 +19,7 @@ } // convert to ARGB if it isn't - if (CGImageGetBitsPerPixel(imageRef) != 32 || !((CGImageGetBitmapInfo(imageRef) & kCGBitmapAlphaInfoMask))) { + if (CGImageGetBitsPerPixel(imageRef) != 32 || (((CGImageGetBitmapInfo(imageRef) & kCGBitmapAlphaInfoMask)) == 0u)) { UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat]; rendererFormat.scale = inputImage.scale; UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:inputImage.size @@ -36,11 +36,11 @@ buffer1.rowBytes = buffer2.rowBytes = CGImageGetBytesPerRow(imageRef); size_t bytes = buffer1.rowBytes * buffer1.height; buffer1.data = malloc(bytes); - if (!buffer1.data) { + if (buffer1.data == nullptr) { return inputImage; } buffer2.data = malloc(bytes); - if (!buffer2.data) { + if (buffer2.data == nullptr) { free(buffer1.data); return inputImage; } @@ -60,7 +60,7 @@ return inputImage; } void *tempBuffer = malloc(tempBufferSize); - if (!tempBuffer) { + if (tempBuffer == nullptr) { free(buffer1.data); free(buffer2.data); return inputImage; diff --git a/packages/react-native/Libraries/Image/RCTImageStoreManager.mm b/packages/react-native/Libraries/Image/RCTImageStoreManager.mm index 0f99fbed6b57..b28824556e0e 100644 --- a/packages/react-native/Libraries/Image/RCTImageStoreManager.mm +++ b/packages/react-native/Libraries/Image/RCTImageStoreManager.mm @@ -48,7 +48,7 @@ - (void)removeImageForTag:(NSString *)imageTag withBlock:(void (^)(void))block { dispatch_async(_methodQueue, ^{ [self removeImageForTag:imageTag]; - if (block) { + if (block != nullptr) { block(); } }); @@ -58,7 +58,7 @@ - (NSString *)_storeImageData:(NSData *)imageData { RCTAssertThread(_methodQueue, @"Must be called on RCTImageStoreManager thread"); - if (!_store) { + if (_store == nullptr) { _store = [NSMutableDictionary new]; _id = 0; } @@ -112,7 +112,7 @@ - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))bloc : (RCTResponseSenderBlock)errorCallback) { NSData *imageData = _store[imageTag]; - if (!imageData) { + if (imageData == nullptr) { errorCallback( @[ RCTJSErrorFromNSError(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag])) ]); return; @@ -132,7 +132,7 @@ - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))bloc // Dispatching to a background thread to perform base64 decoding dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ NSData *imageData = [[NSData alloc] initWithBase64EncodedString:base64String options:0]; - if (imageData) { + if (imageData != nullptr) { dispatch_async(self->_methodQueue, ^{ successCallback(@[ [self _storeImageData:imageData] ]); }); @@ -164,14 +164,14 @@ - (id)sendRequest:(NSURLRequest *)request withDelegate:(id_store[imageTag]; - if (!imageData) { + if (imageData == nullptr) { NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]); [delegate URLRequest:cancellationBlock didCompleteWithError:error]; return; } CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL); - if (!sourceRef) { + if (sourceRef == nullptr) { NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]); [delegate URLRequest:cancellationBlock didCompleteWithError:error]; @@ -197,7 +197,7 @@ - (id)sendRequest:(NSURLRequest *)request withDelegate:(id *)eventPath valueNode:(RCTValueAnimatedNode *)valueNode { - if ((self = [super init])) { + if ((self = [super init]) != nullptr) { _eventPath = eventPath; _valueNode = valueNode; }