Update webserver.cpp

oberdorc · web-flow · commit f336fecfefb5 · 2024-03-03T22:29:07.000+01:00
Address an error that _key_ in the static PSK handler function is assigned a value that is never used in the case if the Gnu TLS libary is not present, i.e. HAVE_GNUTLS has not been defined.

The intended behavior is such that calling the static callback handler function of the webserver guarantees that the user registered callback function is invoked.
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -182,7 +182,7 @@ void webserver::sweet_kill() {
 }
 
 void webserver::psk_cred_handler_func(void* cls, const struct MHD_Connection*, const char* username, void** psk, size_t* psk_size) {
-    std::string key = std::invoke(static_cast<const webserver*>(cls)->psk_cred_handler,username);
+    [[maybe_unused]] std::string key = std::invoke(static_cast<const webserver*>(cls)->psk_cred_handler,username);
 
 #ifdef HAVE_GNUTLS
     *psk_size = key.length();

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ void webserver::sweet_kill() {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`void webserver::psk_cred_handler_func(void* cls, const struct MHD_Connection, const char username, void** psk, size_t* psk_size) {`
`185`		`- std::string key = std::invoke(static_cast<const webserver*>(cls)->psk_cred_handler,username);`
	`185`	`+ [[maybe_unused]] std::string key = std::invoke(static_cast<const webserver*>(cls)->psk_cred_handler,username);`
`186`	`186`
`187`	`187`	`#ifdef HAVE_GNUTLS`
`188`	`188`	`*psk_size = key.length();`