PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cam: options: Don't initialise variable-length arrays

Browse Source 
According to clang, variable-length arrays can't be initialised. Don't
do so, and explicitly set the last element to 0 instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2019-04-26 17:47:13 +03:00
parent d98ab6f2ae
commit 5d987629d9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cam/options.cpp
View File

@@ -382,8 +382,8 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)
* Allocate short and long options arrays large enough to contain all
* options.
*/
char shortOptions[options_.size() * 3 + 2] = {};
struct option longOptions[options_.size() + 1] = {};
char shortOptions[options_.size() * 3 + 2];
struct option longOptions[options_.size() + 1];
unsigned int ids = 0;
unsigned int idl = 0;
@@ -419,6 +419,9 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)
}
}
shortOptions[ids] = '\0';
memset(&longOptions[idl], 0, sizeof(longOptions[idl]));
opterr = 0;
while (true) {