From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 19 Oct 2021 10:32:05 +0000 (+0200)
Subject: remove a bunch of unnecessary &
X-Git-Tag: rec-4.6.0-beta1~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9169938446f9546b01a6b76776776867e9978f41;p=thirdparty%2Fpdns.git

remove a bunch of unnecessary &
---

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 44df390012..4cffff3fa7 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -2336,27 +2336,27 @@ void AuthWebServer::webThread()
   try {
     setThreadName("pdns/webserver");
     if(::arg().mustDo("api")) {
-      d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/search-data", &apiServerSearchData);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/statistics", &apiServerStatistics);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/tsigkeys/<id>", &apiServerTSIGKeyDetail);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/tsigkeys", &apiServerTSIGKeys);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/axfr-retrieve", &apiServerZoneAxfrRetrieve);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/cryptokeys/<key_id>", &apiZoneCryptokeys);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/cryptokeys", &apiZoneCryptokeys);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/export", &apiServerZoneExport);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/metadata/<kind>", &apiZoneMetadataKind);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/metadata", &apiZoneMetadata);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/notify", &apiServerZoneNotify);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/rectify", &apiServerZoneRectify);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>", &apiServerZoneDetail);
-      d_ws->registerApiHandler("/api/v1/servers/localhost/zones", &apiServerZones);
-      d_ws->registerApiHandler("/api/v1/servers/localhost", &apiServerDetail);
-      d_ws->registerApiHandler("/api/v1/servers", &apiServer);
-      d_ws->registerApiHandler("/api/v1", &apiDiscoveryV1);
-      d_ws->registerApiHandler("/api/docs", &apiDocs);
-      d_ws->registerApiHandler("/api", &apiDiscovery);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", apiServerCacheFlush);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/config", apiServerConfig);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/search-data", apiServerSearchData);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/statistics", apiServerStatistics);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/tsigkeys/<id>", apiServerTSIGKeyDetail);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/tsigkeys", apiServerTSIGKeys);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/axfr-retrieve", apiServerZoneAxfrRetrieve);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/cryptokeys/<key_id>", apiZoneCryptokeys);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/cryptokeys", apiZoneCryptokeys);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/export", apiServerZoneExport);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/metadata/<kind>", apiZoneMetadataKind);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/metadata", apiZoneMetadata);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/notify", apiServerZoneNotify);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/rectify", apiServerZoneRectify);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>", apiServerZoneDetail);
+      d_ws->registerApiHandler("/api/v1/servers/localhost/zones", apiServerZones);
+      d_ws->registerApiHandler("/api/v1/servers/localhost", apiServerDetail);
+      d_ws->registerApiHandler("/api/v1/servers", apiServer);
+      d_ws->registerApiHandler("/api/v1", apiDiscoveryV1);
+      d_ws->registerApiHandler("/api/docs", apiDocs);
+      d_ws->registerApiHandler("/api", apiDiscovery);
     }
     if (::arg().mustDo("webserver")) {
       d_ws->registerWebHandler("/style.css", [this](HttpRequest *req, HttpResponse *resp){cssfunction(req, resp);});
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 2c58f79455..c0845ea6dc 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -1149,20 +1149,19 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
   d_ws->bind();
 
   // legacy dispatch
-  d_ws->registerApiHandler(
-    "/jsonstat", [this](HttpRequest* req, HttpResponse* resp) { jsonstat(req, resp); }, true);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/config/allow-from", &apiServerConfigAllowFrom);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/rpzstatistics", &apiServerRPZStats);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/search-data", &apiServerSearchData);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/statistics", &apiServerStatistics, true);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>", &apiServerZoneDetail);
-  d_ws->registerApiHandler("/api/v1/servers/localhost/zones", &apiServerZones);
-  d_ws->registerApiHandler("/api/v1/servers/localhost", &apiServerDetail, true);
-  d_ws->registerApiHandler("/api/v1/servers", &apiServer);
-  d_ws->registerApiHandler("/api/v1", &apiDiscoveryV1);
-  d_ws->registerApiHandler("/api", &apiDiscovery);
+  d_ws->registerApiHandler("/jsonstat", [this](HttpRequest* req, HttpResponse* resp){jsonstat(req, resp);}, true);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", apiServerCacheFlush);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/config/allow-from", apiServerConfigAllowFrom);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/config", apiServerConfig);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/rpzstatistics", apiServerRPZStats);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/search-data", apiServerSearchData);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/statistics", apiServerStatistics, true);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>", apiServerZoneDetail);
+  d_ws->registerApiHandler("/api/v1/servers/localhost/zones", apiServerZones);
+  d_ws->registerApiHandler("/api/v1/servers/localhost", apiServerDetail, true);
+  d_ws->registerApiHandler("/api/v1/servers", apiServer);
+  d_ws->registerApiHandler("/api/v1", apiDiscoveryV1);
+  d_ws->registerApiHandler("/api", apiDiscovery);
 
   for (const auto& u : g_urlmap) {
     d_ws->registerWebHandler("/" + u.first, serveStuff);