aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Scripting: Cleanups to remove false posive warnings

Browse Source
This commit is contained in:
Michael du Breuil 2020-03-27 20:12:06 -07:00 committed by Andrew Tridgell
parent d50e9865bd
commit 75b133926f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Scripting/lua/src/lua.c
View File

@ -1,3 +1,4 @@
#if 0
/* /*
** $Id: lua.c,v 1.230.1.1 2017/04/19 17:29:57 roberto Exp $ ** $Id: lua.c,v 1.230.1.1 2017/04/19 17:29:57 roberto Exp $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
@ -610,3 +611,4 @@ int main (int argc, char **argv) {
return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE; return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
#endif

8
libraries/AP_Scripting/lua_repl.cpp
View File

@ -98,7 +98,6 @@ int lua_scripts::incomplete(lua_State *L, int status) {
*/ */
int lua_scripts::pushline(lua_State *L, int firstline) { int lua_scripts::pushline(lua_State *L, int firstline) {
char buffer[LUA_MAXINPUT + 1] = {}; char buffer[LUA_MAXINPUT + 1] = {};
ssize_t read_bytes;
size_t l = 0; size_t l = 0;
// send prompt to the user // send prompt to the user
@ -109,15 +108,12 @@ int lua_scripts::pushline(lua_State *L, int firstline) {
int input_fd = AP::FS().open(REPL_IN, O_RDONLY); int input_fd = AP::FS().open(REPL_IN, O_RDONLY);
if (input_fd != -1) { if (input_fd != -1) {
AP::FS().lseek(input_fd, terminal.input_offset, SEEK_SET); AP::FS().lseek(input_fd, terminal.input_offset, SEEK_SET);
read_bytes = AP::FS().read(input_fd, buffer, ARRAY_SIZE(buffer) - 1); ssize_t read_bytes = AP::FS().read(input_fd, buffer, ARRAY_SIZE(buffer) - 1);
AP::FS().close(input_fd); AP::FS().close(input_fd);
if (read_bytes > 0) { if (read_bytes > 0) {
// locate the first newline // locate the first newline
char * newline_chr = strchr(buffer, '\n'); char * newline_chr = strchr(buffer, '\n');
if (newline_chr == NULL) { if (newline_chr != NULL) {
// we don't have something that looks like a newline, just keep reading till it's longer
read_bytes = 0;
} else {
newline_chr[0] = '\0'; newline_chr[0] = '\0';
// only advance to the newline // only advance to the newline
l = strlen(buffer); l = strlen(buffer);

2
libraries/AP_Scripting/lua_scripts.cpp
View File

@ -374,7 +374,9 @@ void lua_scripts::run(void) {
load_all_scripts_in_dir(L, SCRIPTING_DIRECTORY); load_all_scripts_in_dir(L, SCRIPTING_DIRECTORY);
load_all_scripts_in_dir(L, "@ROMFS/scripts"); load_all_scripts_in_dir(L, "@ROMFS/scripts");
#ifndef __clang_analyzer__
succeeded_initial_load = true; succeeded_initial_load = true;
#endif // __clang_analyzer__
while (AP_Scripting::get_singleton()->enabled()) { while (AP_Scripting::get_singleton()->enabled()) {
// handle terminal data if we have any // handle terminal data if we have any