Skip to content

Commit

Permalink
Bug 1543331 - clang-format nsDNSService2.cpp r=dragana
Browse files Browse the repository at this point in the history 
Differential Revision: https://phabricator.services.mozilla.com/D63107

--HG--
extra : moz-landing-system : lando
  • Loading branch information
@valenting
valenting committed Feb 17, 2020
1 parent a5deb4a commit 541f162
Showing 1 changed file with 41 additions and 34 deletions.
75 changes: 41 additions & 34 deletions netwerk/dns/nsDNSService2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ class nsDNSAsyncRequest final : public nsResolveHostCallback,
size_t SizeOfIncludingThis(mozilla::MallocSizeOf) const override;

RefPtr<nsHostResolver> mResolver;
nsCString mHost; // hostname we're resolving
nsCString mTrrServer; // A trr server to be used.
nsCString mHost; // hostname we're resolving
nsCString mTrrServer; // A trr server to be used.
uint16_t mType;
const OriginAttributes
mOriginAttributes; // The originAttributes for this resolving
Expand Down Expand Up @@ -873,8 +873,8 @@ nsresult nsDNSService::AsyncResolveInternal(
res, hostname, aTrrServer, type, aOriginAttributes, listener, flags, af);
if (!req) return NS_ERROR_OUT_OF_MEMORY;

rv = res->ResolveHost(req->mHost, req->mTrrServer, type, req->mOriginAttributes,
flags, af, req);
rv = res->ResolveHost(req->mHost, req->mTrrServer, type,
req->mOriginAttributes, flags, af, req);
req.forget(result);
return rv;
}
Expand Down Expand Up @@ -909,8 +909,8 @@ nsresult nsDNSService::CancelAsyncResolveInternal(
uint16_t af =
(aType != RESOLVE_TYPE_DEFAULT) ? 0 : GetAFForLookup(hostname, aFlags);

res->CancelAsyncRequest(hostname, aTrrServer, aType, aOriginAttributes, aFlags,
af, aListener, aReason);
res->CancelAsyncRequest(hostname, aTrrServer, aType, aOriginAttributes,
aFlags, af, aListener, aReason);
return NS_OK;
}

Expand All @@ -927,8 +927,8 @@ nsDNSService::AsyncResolve(const nsACString& aHostname, uint32_t flags,
}
}

return AsyncResolveInternal(aHostname, EmptyCString(), RESOLVE_TYPE_DEFAULT, flags,
listener, target_, attrs, result);
return AsyncResolveInternal(aHostname, EmptyCString(), RESOLVE_TYPE_DEFAULT,
flags, listener, target_, attrs, result);
}

NS_IMETHODIMP
Expand All @@ -937,15 +937,17 @@ nsDNSService::AsyncResolveNative(const nsACString& aHostname, uint32_t flags,
nsIEventTarget* target_,
const OriginAttributes& aOriginAttributes,
nsICancelable** result) {
return AsyncResolveInternal(aHostname, EmptyCString(), RESOLVE_TYPE_DEFAULT, flags,
aListener, target_, aOriginAttributes, result);
return AsyncResolveInternal(aHostname, EmptyCString(), RESOLVE_TYPE_DEFAULT,
flags, aListener, target_, aOriginAttributes,
result);
}

NS_IMETHODIMP
nsDNSService::AsyncResolveWithTrrServer(const nsACString& aHostname,
const nsACString& aTrrServer, uint32_t flags, nsIDNSListener* listener,
nsIEventTarget* target_, JS::HandleValue aOriginAttributes, JSContext* aCx,
uint8_t aArgc, nsICancelable** result) {
nsDNSService::AsyncResolveWithTrrServer(
const nsACString& aHostname, const nsACString& aTrrServer, uint32_t flags,
nsIDNSListener* listener, nsIEventTarget* target_,
JS::HandleValue aOriginAttributes, JSContext* aCx, uint8_t aArgc,
nsICancelable** result) {
OriginAttributes attrs;

if (aArgc == 1) {
Expand All @@ -954,17 +956,18 @@ nsDNSService::AsyncResolveWithTrrServer(const nsACString& aHostname,
}
}

return AsyncResolveInternal(aHostname, aTrrServer, RESOLVE_TYPE_DEFAULT, flags,
listener, target_, attrs, result);
return AsyncResolveInternal(aHostname, aTrrServer, RESOLVE_TYPE_DEFAULT,
flags, listener, target_, attrs, result);
}

NS_IMETHODIMP
nsDNSService::AsyncResolveWithTrrServerNative(
const nsACString& aHostname, const nsACString& aTrrServer, uint32_t flags,
nsIDNSListener* aListener, nsIEventTarget* target_,
const OriginAttributes& aOriginAttributes, nsICancelable** result) {
return AsyncResolveInternal(aHostname, aTrrServer, RESOLVE_TYPE_DEFAULT, flags,
aListener, target_, aOriginAttributes, result);
return AsyncResolveInternal(aHostname, aTrrServer, RESOLVE_TYPE_DEFAULT,
flags, aListener, target_, aOriginAttributes,
result);
}

NS_IMETHODIMP
Expand All @@ -982,17 +985,17 @@ nsDNSService::AsyncResolveByType(const nsACString& aHostname, uint16_t aType,
}
}

return AsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags, aListener,
aTarget_, attrs, aResult);
return AsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags,
aListener, aTarget_, attrs, aResult);
}

NS_IMETHODIMP
nsDNSService::AsyncResolveByTypeNative(
const nsACString& aHostname, uint16_t aType, uint32_t aFlags,
nsIDNSListener* aListener, nsIEventTarget* aTarget_,
const OriginAttributes& aOriginAttributes, nsICancelable** aResult) {
return AsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags, aListener,
aTarget_, aOriginAttributes, aResult);
return AsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags,
aListener, aTarget_, aOriginAttributes, aResult);
}

NS_IMETHODIMP
Expand All @@ -1008,22 +1011,25 @@ nsDNSService::CancelAsyncResolve(const nsACString& aHostname, uint32_t aFlags,
}
}

return CancelAsyncResolveInternal(aHostname, EmptyCString(), RESOLVE_TYPE_DEFAULT,
aFlags, aListener, aReason, attrs);
return CancelAsyncResolveInternal(aHostname, EmptyCString(),
RESOLVE_TYPE_DEFAULT, aFlags, aListener,
aReason, attrs);
}

NS_IMETHODIMP
nsDNSService::CancelAsyncResolveNative(
const nsACString& aHostname, uint32_t aFlags, nsIDNSListener* aListener,
nsresult aReason, const OriginAttributes& aOriginAttributes) {
return CancelAsyncResolveInternal(aHostname, EmptyCString(), RESOLVE_TYPE_DEFAULT,
aFlags, aListener, aReason, aOriginAttributes);
return CancelAsyncResolveInternal(aHostname, EmptyCString(),
RESOLVE_TYPE_DEFAULT, aFlags, aListener,
aReason, aOriginAttributes);
}

NS_IMETHODIMP
nsDNSService::CancelAsyncResolveWithTrrServer(const nsACString& aHostname,
const nsACString& aTrrServer, uint32_t aFlags, nsIDNSListener* aListener,
nsresult aReason, JS::HandleValue aOriginAttributes, JSContext* aCx, uint8_t aArgc) {
nsDNSService::CancelAsyncResolveWithTrrServer(
const nsACString& aHostname, const nsACString& aTrrServer, uint32_t aFlags,
nsIDNSListener* aListener, nsresult aReason,
JS::HandleValue aOriginAttributes, JSContext* aCx, uint8_t aArgc) {
OriginAttributes attrs;

if (aArgc == 1) {
Expand All @@ -1042,7 +1048,8 @@ nsDNSService::CancelAsyncResolveWithTrrServerNative(
nsIDNSListener* aListener, nsresult aReason,
const OriginAttributes& aOriginAttributes) {
return CancelAsyncResolveInternal(aHostname, aTrrServer, RESOLVE_TYPE_DEFAULT,
aFlags, aListener, aReason, aOriginAttributes);
aFlags, aListener, aReason,
aOriginAttributes);
}

NS_IMETHODIMP
Expand All @@ -1060,17 +1067,17 @@ nsDNSService::CancelAsyncResolveByType(const nsACString& aHostname,
}
}

return CancelAsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags, aListener,
aReason, attrs);
return CancelAsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags,
aListener, aReason, attrs);
}

NS_IMETHODIMP
nsDNSService::CancelAsyncResolveByTypeNative(
const nsACString& aHostname, uint16_t aType, uint32_t aFlags,
nsIDNSListener* aListener, nsresult aReason,
const OriginAttributes& aOriginAttributes) {
return CancelAsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags, aListener,
aReason, aOriginAttributes);
return CancelAsyncResolveInternal(aHostname, EmptyCString(), aType, aFlags,
aListener, aReason, aOriginAttributes);
}

NS_IMETHODIMP
Expand Down

0 comments on commit 541f162

Please sign in to comment.