[Controllers] Make sure forward declaration of do_process_xx_delay_queue is on single line

If this is somehow changed in a multi line forward declaration, it may cause build issues.
This commit is contained in:
Gijs Noorlander
2020-02-18 18:35:15 +01:00
parent d97febf52e
commit 3e87d6f1ed
15 changed files with 52 additions and 3 deletions
+4 -3
View File
@@ -460,10 +460,11 @@ size_t streamFile_htmlEscape(const String& fileName)
#define TASKS_PER_PAGE TASKS_MAX
// Uncrustify must not be used on macros, so turn it off.
// *INDENT-OFF*
#define strncpy_webserver_arg(D, N) safe_strncpy(D, WebServer.arg(N).c_str(), sizeof(D));
#define update_whenset_FormItemInt(K, V) { int tmpVal; \
if (getCheckWebserverArg_int(K, tmpVal)) V = tmpVal; }
// Uncrustify must not be used on macros, but we're now done, so turn Uncrustify on again.
// *INDENT-ON*
void WebServerInit()
{
+3
View File
@@ -120,7 +120,10 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String&
return success;
}
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c001_delay_queue(int controller_number, const C001_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c001_delay_queue(int controller_number, const C001_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
WiFiClient client;
+3
View File
@@ -66,7 +66,10 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String&
return success;
}
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c003_delay_queue(int controller_number, const C003_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c003_delay_queue(int controller_number, const C003_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
bool success = false;
+3
View File
@@ -77,7 +77,10 @@ bool CPlugin_004(CPlugin::Function function, struct EventStruct *event, String&
return success;
}
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c004_delay_queue(int controller_number, const C004_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c004_delay_queue(int controller_number, const C004_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
WiFiClient client;
+3
View File
@@ -69,7 +69,10 @@ bool CPlugin_007(CPlugin::Function function, struct EventStruct *event, String&
return success;
}
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c007_delay_queue(int controller_number, const C007_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c007_delay_queue(int controller_number, const C007_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
WiFiClient client;
+4
View File
@@ -97,7 +97,11 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String&
//********************************************************************************
// Generic HTTP get request
//********************************************************************************
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c008_delay_queue(int controller_number, const C008_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c008_delay_queue(int controller_number, const C008_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
while (element.txt[element.valuesSent] == "") {
+4
View File
@@ -89,7 +89,11 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String&
/*********************************************************************************************\
* FHEM HTTP request
\*********************************************************************************************/
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c009_delay_queue(int controller_number, const C009_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c009_delay_queue(int controller_number, const C009_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
WiFiClient client;
+4
View File
@@ -87,7 +87,11 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String&
//********************************************************************************
// Generic UDP message
//********************************************************************************
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c010_delay_queue(int controller_number, const C010_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c010_delay_queue(int controller_number, const C010_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
while (element.txt[element.valuesSent] == "") {
+4
View File
@@ -134,7 +134,11 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String&
//********************************************************************************
// Generic HTTP request
//********************************************************************************
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c011_delay_queue(int controller_number, const C011_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c011_delay_queue(int controller_number, const C011_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
WiFiClient client;
+4
View File
@@ -79,7 +79,11 @@ bool CPlugin_012(CPlugin::Function function, struct EventStruct *event, String&
//********************************************************************************
// Process Queued Blynk request, with data set to NULL
//********************************************************************************
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c012_delay_queue(int controller_number, const C012_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c012_delay_queue(int controller_number, const C012_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
while (element.txt[element.valuesSent] == "") {
+4
View File
@@ -200,7 +200,11 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String&
// Process Queued Blynk request, with data set to NULL
//********************************************************************************
// controller_plugin_number = 015 because of C015
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
if (!Settings.ControllerEnabled[element.controller_idx])
+3
View File
@@ -121,7 +121,10 @@ bool CPlugin_016(CPlugin::Function function, struct EventStruct *event, String&
//********************************************************************************
// Process the data from the cache
//********************************************************************************
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c016_delay_queue(int controller_number, const C016_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c016_delay_queue(int controller_number, const C016_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
return true;
+3
View File
@@ -75,7 +75,10 @@ bool CPlugin_017(CPlugin::Function function, struct EventStruct *event, String &
return success;
}
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c017_delay_queue(int controller_number, const C017_queue_element &element, ControllerSettingsStruct &ControllerSettings);
// *INDENT-ON*
bool do_process_c017_delay_queue(int controller_number, const C017_queue_element &element, ControllerSettingsStruct &ControllerSettings)
{
+3
View File
@@ -661,7 +661,10 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String&
return success;
}
// Uncrustify may change this into multi line, which will result in failed builds
// *INDENT-OFF*
bool do_process_c018_delay_queue(int controller_number, const C018_queue_element& element, ControllerSettingsStruct& ControllerSettings);
// *INDENT-ON*
bool do_process_c018_delay_queue(int controller_number, const C018_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
bool success = C018_data.txHexBytes(element.packed, ControllerSettings.Port);
@@ -158,6 +158,9 @@ struct ControllerDelayHandlerStruct {
};
// Uncrustify must not be used on macros, so turn it off.
// Also make sure to wrap the forward declaration of this function in the same wrappers
// as it may not split the forward declaration into multiple lines.
//
// *INDENT-OFF*