@@ -372,7 +372,6 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * userData)
372
372
373
373
CHIP_ERROR ResolveAsync (chip::Dnssd::ResolveContext * rCtx)
374
374
{
375
- CHIP_ERROR err = CHIP_NO_ERROR;
376
375
int ret;
377
376
378
377
assertChipStackLockedByCurrentThread ();
@@ -386,23 +385,20 @@ CHIP_ERROR ResolveAsync(chip::Dnssd::ResolveContext * rCtx)
386
385
else
387
386
{
388
387
char iface[IF_NAMESIZE + 1 ] = " " ;
389
- VerifyOrExit (if_indextoname (rCtx->mInterfaceId , iface) != nullptr ,
390
- ChipLogError (DeviceLayer, " if_indextoname() failed: %s" , strerror (errno));
391
- err = CHIP_ERROR_POSIX (errno));
388
+ VerifyOrReturnValue (if_indextoname (rCtx->mInterfaceId , iface) != nullptr , CHIP_ERROR_POSIX (errno),
389
+ ChipLogError (DeviceLayer, " if_indextoname() failed: %s" , strerror (errno)));
392
390
ret = dnssd_create_remote_service (rCtx->mType , rCtx->mName , iface, &rCtx->mServiceHandle );
393
391
}
394
392
395
- VerifyOrExit (ret == DNSSD_ERROR_NONE,
396
- ChipLogError (DeviceLayer, " dnssd_create_remote_service() failed: %s" , get_error_message (ret));
397
- err = TizenToChipError (ret));
393
+ VerifyOrReturnValue (ret == DNSSD_ERROR_NONE, TizenToChipError (ret),
394
+ ChipLogError (DeviceLayer, " dnssd_create_remote_service() failed: %s" , get_error_message (ret)));
398
395
399
396
ret = dnssd_resolve_service (rCtx->mServiceHandle , OnResolve, rCtx);
400
397
VerifyOrReturnValue (ret == DNSSD_ERROR_NONE, TizenToChipError (ret),
401
398
ChipLogError (DeviceLayer, " dnssd_resolve_service() failed: %s" , get_error_message (ret)));
402
399
403
400
rCtx->mIsResolving = true ;
404
- exit :
405
- return err;
401
+ return CHIP_NO_ERROR;
406
402
}
407
403
408
404
} // namespace
0 commit comments