Skip to content

Commit e843822

Browse files
committed
Removed flexible array usage due to error on g++ 10.x
1 parent de240e2 commit e843822

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

qt/cmd.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ typedef struct __attribute__((__packed__))
6464
{
6565
Cmd cmd;
6666
uint8_t len;
67-
uint8_t data[];
6867
} WriteDataCmd;
6968

7069
typedef struct __attribute__((__packed__))
@@ -136,7 +135,6 @@ typedef struct __attribute__((__packed__))
136135
{
137136
uint8_t code;
138137
uint8_t info;
139-
uint8_t data[];
140138
} RespHeader;
141139

142140
typedef struct __attribute__((__packed__))

qt/reader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ int Reader::handleStatus(uint8_t *pbuf, uint32_t len)
159159
int Reader::handleData(uint8_t *pbuf, uint32_t len)
160160
{
161161
RespHeader *header = reinterpret_cast<RespHeader *>(pbuf);
162+
uint8_t *data = pbuf + sizeof(RespHeader);
162163
uint8_t dataSize = header->info;
163164
size_t headerSize = sizeof(RespHeader), packetSize = headerSize + dataSize;
164165

@@ -178,7 +179,7 @@ int Reader::handleData(uint8_t *pbuf, uint32_t len)
178179
return -1;
179180
}
180181

181-
memcpy(rbuf + readOffset, header->data, dataSize);
182+
memcpy(rbuf + readOffset, data, dataSize);
182183
readOffset += dataSize;
183184
bytesRead += dataSize;
184185

0 commit comments

Comments
 (0)