mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-25 19:56:30 +00:00
Better fix GCC 10.1 warnings
This commit is contained in:
parent
07ca4dde23
commit
214b227942
@ -89,44 +89,34 @@ void MdnsUpdate(void) {
|
|||||||
\*********************************************************************************************/
|
\*********************************************************************************************/
|
||||||
|
|
||||||
char* NetworkHostname(void) {
|
char* NetworkHostname(void) {
|
||||||
if (global_state.eth_down) {
|
|
||||||
return my_hostname;
|
|
||||||
}
|
|
||||||
#ifdef ESP32
|
#ifdef ESP32
|
||||||
#ifdef USE_ETHERNET
|
#ifdef USE_ETHERNET
|
||||||
else {
|
if (!global_state.eth_down) {
|
||||||
return EthernetHostname();
|
return EthernetHostname();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return nullptr; // Never reached. Fix GCC10 warning
|
return my_hostname;
|
||||||
}
|
}
|
||||||
|
|
||||||
IPAddress NetworkAddress(void) {
|
IPAddress NetworkAddress(void) {
|
||||||
IPAddress result;
|
|
||||||
if (global_state.eth_down) {
|
|
||||||
result = WiFi.localIP();
|
|
||||||
}
|
|
||||||
#ifdef ESP32
|
#ifdef ESP32
|
||||||
#ifdef USE_ETHERNET
|
#ifdef USE_ETHERNET
|
||||||
else {
|
if (!global_state.eth_down) {
|
||||||
result = EthernetLocalIP();
|
return EthernetLocalIP();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return result;
|
return WiFi.localIP();
|
||||||
}
|
}
|
||||||
|
|
||||||
String NetworkMacAddress(void) {
|
String NetworkMacAddress(void) {
|
||||||
if (global_state.eth_down) {
|
|
||||||
return WiFi.macAddress();
|
|
||||||
}
|
|
||||||
#ifdef ESP32
|
#ifdef ESP32
|
||||||
#ifdef USE_ETHERNET
|
#ifdef USE_ETHERNET
|
||||||
else {
|
if (!global_state.eth_down) {
|
||||||
return EthernetMacAddress();
|
return EthernetMacAddress();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return String(""); // Never reached. Fix GCC10 warning
|
return WiFi.macAddress();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user