Simplify cliWriter structure definition as use of uint8_t data[] (flexible array member) at the end of the bufWriter_t structure is breaking the F411 build

lib/main/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c

@@ -186,7 +186,7 @@ __ALIGN_BEGIN uint8_t CmdBuff[CDC_CMD_PACKET_SZE] __ALIGN_END ;
 
 volatile uint32_t APP_Rx_ptr_in  = 0;
 volatile uint32_t APP_Rx_ptr_out = 0;
-volatile uint32_t APP_Rx_length  = 0;
+uint32_t APP_Rx_length  = 0;
 
 uint8_t  USB_Tx_State = USB_CDC_IDLE;
 
@@ -641,7 +641,7 @@ uint8_t  usbd_cdc_DataIn (void *pdev, uint8_t epnum)
             DCD_EP_Tx(pdev, CDC_IN_EP, (uint8_t*)&APP_Rx_Buffer[APP_Rx_ptr_out], USB_Tx_length);
 
             // Advance the out pointer
-            APP_Rx_ptr_out = (APP_Rx_ptr_out + USB_Tx_length) % APP_RX_DATA_SIZE;;
+            APP_Rx_ptr_out = (APP_Rx_ptr_out + USB_Tx_length) % APP_RX_DATA_SIZE;
             APP_Rx_length -= USB_Tx_length;
 
             return USBD_OK;

src/main/cli/cli.c

@@ -181,9 +181,10 @@ static serialPort_t *cliPort = NULL;
 #define CLI_IN_BUFFER_SIZE 256
 #define CLI_OUT_BUFFER_SIZE 64
 
+static bufWriter_t cliWriterDesc;
 static bufWriter_t *cliWriter = NULL;
 static bufWriter_t *cliErrorWriter = NULL;
-static uint8_t cliWriteBuffer[sizeof(bufWriter_t) + CLI_OUT_BUFFER_SIZE];
+static uint8_t cliWriteBuffer[CLI_OUT_BUFFER_SIZE];
 
 static char cliBuffer[CLI_IN_BUFFER_SIZE];
 static uint32_t bufferIndex = 0;
@@ -6863,8 +6864,8 @@ void cliEnter(serialPort_t *serialPort)
     cliMode = true;
     cliPort = serialPort;
     setPrintfSerialPort(cliPort);
-    cliWriter = bufWriterInit(cliWriteBuffer, sizeof(cliWriteBuffer), (bufWrite_t)serialWriteBufShim, serialPort);
-    cliErrorWriter = cliWriter;
+    bufWriterInit(&cliWriterDesc, cliWriteBuffer, sizeof(cliWriteBuffer), (bufWrite_t)serialWriteBufShim, serialPort);
+    cliErrorWriter = cliWriter = &cliWriterDesc;
 
 #ifndef MINIMAL_CLI
     cliPrintLine("\r\nEntering CLI Mode, type 'exit' to return, or 'help'");

src/main/drivers/buf_writer.c

@@ -24,15 +24,14 @@
 
 #include "buf_writer.h"
 
-bufWriter_t *bufWriterInit(uint8_t *b, int total_size, bufWrite_t writer, void *arg)
+void bufWriterInit(bufWriter_t *b, uint8_t *data, int size, bufWrite_t writer, void *arg)
 {
     bufWriter_t *buf = (bufWriter_t *)b;
     buf->writer = writer;
     buf->arg = arg;
     buf->at = 0;
-    buf->capacity = total_size - sizeof(*buf);
-
-    return buf;
+    buf->capacity = size;
+    buf->data = data;
 }
 
 void bufWriterAppend(bufWriter_t *b, uint8_t ch)

src/main/drivers/buf_writer.h

@@ -26,16 +26,12 @@ typedef void (*bufWrite_t)(void *arg, void *data, int count);
 typedef struct bufWriter_s {
     bufWrite_t writer;
     void *arg;
+    uint8_t *data;
     uint8_t capacity;
     uint8_t at;
-    uint8_t data[];
 } bufWriter_t;
 
 // Initialise a block of memory as a buffered writer.
-//
-// b should be sizeof(bufWriter_t) + the number of bytes to buffer.
-// total_size should be the total size of b.
-//
-bufWriter_t *bufWriterInit(uint8_t *b, int total_size, bufWrite_t writer, void *p);
+void bufWriterInit(bufWriter_t *b, uint8_t *data, int size, bufWrite_t writer, void *p);
 void bufWriterAppend(bufWriter_t *b, uint8_t ch);
 void bufWriterFlush(bufWriter_t *b);

src/main/vcpf4/usbd_cdc_vcp.c

@@ -191,7 +191,7 @@ uint32_t CDC_Send_DATA(const uint8_t *ptrBuffer, uint32_t sendLength)
 
 uint32_t CDC_Send_FreeBytes(void)
 {
-    return APP_RX_DATA_SIZE - CDC_Receive_BytesAvailable();;
+    return APP_RX_DATA_SIZE - CDC_Receive_BytesAvailable();
 }
 
 /**

src/test/unit/cli_unittest.cc

@@ -325,7 +325,7 @@ uint8_t serialRead(serialPort_t *){return 0;}
 
 void bufWriterAppend(bufWriter_t *, uint8_t ch){ printf("%c", ch); }
 void serialWriteBufShim(void *, const uint8_t *, int) {}
-bufWriter_t *bufWriterInit(uint8_t *, int, bufWrite_t, void *) {return NULL;}
+void bufWriterInit(bufWriter_t *, uint8_t *, int, bufWrite_t, void *) { }
 void setArmingDisabled(armingDisableFlags_e) {}
 
 void waitForSerialPortToFinishTransmitting(serialPort_t *) {}