@@ -383,17 +383,27 @@ CHIP_ERROR ResolveAsync(chip::Dnssd::ResolveContext * rCtx)
383
383
else
384
384
{
385
385
char iface[IF_NAMESIZE + 1 ] = " " ;
386
- VerifyOrReturnValue (if_indextoname (rCtx->mInterfaceId , iface) != nullptr , CHIP_ERROR_POSIX (errno),
387
- ChipLogError (DeviceLayer, " if_indextoname() failed: %s" , strerror (errno)));
386
+ if (if_indextoname (rCtx->mInterfaceId , iface) == nullptr )
387
+ {
388
+ ChipLogError (DeviceLayer, " if_indextoname() failed: %s" , strerror (errno));
389
+ return CHIP_ERROR_POSIX (errno);
390
+ }
391
+
388
392
ret = dnssd_create_remote_service (rCtx->mType , rCtx->mName , iface, &rCtx->mServiceHandle );
389
393
}
390
394
391
- VerifyOrReturnValue (ret == DNSSD_ERROR_NONE, TizenToChipError (ret),
392
- ChipLogError (DeviceLayer, " dnssd_create_remote_service() failed: %s" , get_error_message (ret)));
395
+ if (ret != DNSSD_ERROR_NONE)
396
+ {
397
+ ChipLogError (DeviceLayer, " dnssd_create_remote_service() failed: %s" , get_error_message (ret));
398
+ return TizenToChipError (ret);
399
+ }
393
400
394
401
ret = dnssd_resolve_service (rCtx->mServiceHandle , OnResolve, rCtx);
395
- VerifyOrReturnValue (ret == DNSSD_ERROR_NONE, TizenToChipError (ret),
396
- ChipLogError (DeviceLayer, " dnssd_resolve_service() failed: %s" , get_error_message (ret)));
402
+ if (ret != DNSSD_ERROR_NONE)
403
+ {
404
+ ChipLogError (DeviceLayer, " dnssd_resolve_service() failed: %s" , get_error_message (ret));
405
+ return TizenToChipError (ret);
406
+ }
397
407
398
408
rCtx->mIsResolving = true ;
399
409
return CHIP_NO_ERROR;
0 commit comments