Browse Source

fix incorrect argc < 1 check for no arguments

-requiring arguments should be argc < 2
sbg
Daniel Agar 10 years ago committed by Lorenz Meier
parent
commit
2e824bbeea
  1. 3
      src/drivers/ardrone_interface/ardrone_interface.c
  2. 2
      src/drivers/hott/hott_sensors/hott_sensors.cpp
  3. 2
      src/drivers/hott/hott_telemetry/hott_telemetry.cpp
  4. 3
      src/drivers/md25/md25_main.cpp
  5. 3
      src/drivers/roboclaw/roboclaw_main.cpp
  6. 2
      src/examples/fixedwing_control/main.c
  7. 2
      src/examples/flow_position_estimator/flow_position_estimator_main.c
  8. 2
      src/examples/matlab_csv_serial/matlab_csv_serial.c
  9. 2
      src/examples/publisher/publisher_start_nuttx.cpp
  10. 2
      src/examples/px4_daemon_app/px4_daemon_app.c
  11. 2
      src/examples/rover_steering_control/main.cpp
  12. 2
      src/examples/subscriber/subscriber_start_nuttx.cpp
  13. 3
      src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
  14. 3
      src/modules/attitude_estimator_so3/attitude_estimator_so3_main.cpp
  15. 2
      src/modules/commander/commander.cpp
  16. 2
      src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
  17. 3
      src/modules/fixedwing_backside/fixedwing_backside_main.cpp
  18. 3
      src/modules/fw_att_control/fw_att_control_main.cpp
  19. 3
      src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
  20. 2
      src/modules/land_detector/land_detector_main.cpp
  21. 3
      src/modules/mc_att_control/mc_att_control_main.cpp
  22. 2
      src/modules/mc_att_control_multiplatform/mc_att_control_start_nuttx.cpp
  23. 2
      src/modules/mc_pos_control/mc_pos_control_main.cpp
  24. 2
      src/modules/mc_pos_control_multiplatform/mc_pos_control_start_nuttx.cpp
  25. 2
      src/modules/position_estimator_inav/position_estimator_inav_main.c
  26. 3
      src/modules/segway/segway_main.cpp
  27. 2
      src/modules/sensors/sensors.cpp
  28. 2
      src/modules/vtol_att_control/vtol_att_control_main.cpp

3
src/drivers/ardrone_interface/ardrone_interface.c

@ -108,8 +108,9 @@ usage(const char *reason) @@ -108,8 +108,9 @@ usage(const char *reason)
*/
int ardrone_interface_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage("missing command");
}
if (!strcmp(argv[1], "start")) {

2
src/drivers/hott/hott_sensors/hott_sensors.cpp

@ -197,7 +197,7 @@ hott_sensors_thread_main(int argc, char *argv[]) @@ -197,7 +197,7 @@ hott_sensors_thread_main(int argc, char *argv[])
int
hott_sensors_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "missing command\n%s", commandline_usage);
}

2
src/drivers/hott/hott_telemetry/hott_telemetry.cpp

@ -223,7 +223,7 @@ hott_telemetry_thread_main(int argc, char *argv[]) @@ -223,7 +223,7 @@ hott_telemetry_thread_main(int argc, char *argv[])
int
hott_telemetry_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "missing command\n%s", commandline_usage);
}

3
src/drivers/md25/md25_main.cpp

@ -97,8 +97,9 @@ usage(const char *reason) @@ -97,8 +97,9 @@ usage(const char *reason)
int md25_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage("missing command");
}
if (!strcmp(argv[1], "start")) {

3
src/drivers/roboclaw/roboclaw_main.cpp

@ -92,8 +92,9 @@ static void usage() @@ -92,8 +92,9 @@ static void usage()
int roboclaw_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage();
}
if (!strcmp(argv[1], "start")) {

2
src/examples/fixedwing_control/main.c

@ -418,7 +418,7 @@ usage(const char *reason) @@ -418,7 +418,7 @@ usage(const char *reason)
*/
int ex_fixedwing_control_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

2
src/examples/flow_position_estimator/flow_position_estimator_main.c

@ -99,7 +99,7 @@ static void usage(const char *reason) @@ -99,7 +99,7 @@ static void usage(const char *reason)
*/
int flow_position_estimator_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

2
src/examples/matlab_csv_serial/matlab_csv_serial.c

@ -91,7 +91,7 @@ static void usage(const char *reason) @@ -91,7 +91,7 @@ static void usage(const char *reason)
*/
int matlab_csv_serial_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

2
src/examples/publisher/publisher_start_nuttx.cpp

@ -54,7 +54,7 @@ extern int main(int argc, char **argv); @@ -54,7 +54,7 @@ extern int main(int argc, char **argv);
extern "C" __EXPORT int publisher_main(int argc, char *argv[]);
int publisher_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: publisher {start|stop|status}");
}

2
src/examples/px4_daemon_app/px4_daemon_app.c

@ -88,7 +88,7 @@ usage(const char *reason) @@ -88,7 +88,7 @@ usage(const char *reason)
*/
int px4_daemon_app_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

2
src/examples/rover_steering_control/main.cpp

@ -412,7 +412,7 @@ usage(const char *reason) @@ -412,7 +412,7 @@ usage(const char *reason)
*/
int rover_steering_control_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

2
src/examples/subscriber/subscriber_start_nuttx.cpp

@ -54,7 +54,7 @@ extern int main(int argc, char **argv); @@ -54,7 +54,7 @@ extern int main(int argc, char **argv);
extern "C" __EXPORT int subscriber_main(int argc, char *argv[]);
int subscriber_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: subscriber {start|stop|status}");
}

3
src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp

@ -118,8 +118,9 @@ usage(const char *reason) @@ -118,8 +118,9 @@ usage(const char *reason)
*/
int attitude_estimator_ekf_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage("missing command");
}
if (!strcmp(argv[1], "start")) {

3
src/modules/attitude_estimator_so3/attitude_estimator_so3_main.cpp

@ -136,8 +136,9 @@ usage(const char *reason) @@ -136,8 +136,9 @@ usage(const char *reason)
*/
int attitude_estimator_so3_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage("missing command");
}
if (!strcmp(argv[1], "start")) {

2
src/modules/commander/commander.cpp

@ -261,7 +261,7 @@ void answer_command(struct vehicle_command_s &cmd, enum VEHICLE_CMD_RESULT resul @@ -261,7 +261,7 @@ void answer_command(struct vehicle_command_s &cmd, enum VEHICLE_CMD_RESULT resul
int commander_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

2
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp

@ -1516,7 +1516,7 @@ int AttitudePositionEstimatorEKF::trip_nan() @@ -1516,7 +1516,7 @@ int AttitudePositionEstimatorEKF::trip_nan()
int ekf_att_pos_estimator_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: ekf_att_pos_estimator {start|stop|status|logging}");
}

3
src/modules/fixedwing_backside/fixedwing_backside_main.cpp

@ -97,8 +97,9 @@ usage(const char *reason) @@ -97,8 +97,9 @@ usage(const char *reason)
int fixedwing_backside_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage("missing command");
}
if (!strcmp(argv[1], "start")) {

3
src/modules/fw_att_control/fw_att_control_main.cpp

@ -1134,8 +1134,9 @@ FixedwingAttitudeControl::start() @@ -1134,8 +1134,9 @@ FixedwingAttitudeControl::start()
int fw_att_control_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
errx(1, "usage: fw_att_control {start|stop|status}");
}
if (!strcmp(argv[1], "start")) {

3
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp

@ -1638,8 +1638,9 @@ FixedwingPositionControl::start() @@ -1638,8 +1638,9 @@ FixedwingPositionControl::start()
int fw_pos_control_l1_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
errx(1, "usage: fw_pos_control_l1 {start|stop|status}");
}
if (!strcmp(argv[1], "start")) {

2
src/modules/land_detector/land_detector_main.cpp

@ -178,7 +178,7 @@ static int land_detector_start(const char *mode) @@ -178,7 +178,7 @@ static int land_detector_start(const char *mode)
int land_detector_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
goto exiterr;
}

3
src/modules/mc_att_control/mc_att_control_main.cpp

@ -922,8 +922,9 @@ MulticopterAttitudeControl::start() @@ -922,8 +922,9 @@ MulticopterAttitudeControl::start()
int mc_att_control_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
errx(1, "usage: mc_att_control {start|stop|status}");
}
if (!strcmp(argv[1], "start")) {

2
src/modules/mc_att_control_multiplatform/mc_att_control_start_nuttx.cpp

@ -54,7 +54,7 @@ extern int main(int argc, char **argv); @@ -54,7 +54,7 @@ extern int main(int argc, char **argv);
extern "C" __EXPORT int mc_att_control_m_main(int argc, char *argv[]);
int mc_att_control_m_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: mc_att_control_m {start|stop|status}");
}

2
src/modules/mc_pos_control/mc_pos_control_main.cpp

@ -1440,7 +1440,7 @@ MulticopterPositionControl::start() @@ -1440,7 +1440,7 @@ MulticopterPositionControl::start()
int mc_pos_control_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: mc_pos_control {start|stop|status}");
}

2
src/modules/mc_pos_control_multiplatform/mc_pos_control_start_nuttx.cpp

@ -54,7 +54,7 @@ extern int main(int argc, char **argv); @@ -54,7 +54,7 @@ extern int main(int argc, char **argv);
extern "C" __EXPORT int mc_pos_control_m_main(int argc, char *argv[]);
int mc_pos_control_m_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: mc_pos_control_m {start|stop|status}");
}

2
src/modules/position_estimator_inav/position_estimator_inav_main.c

@ -134,7 +134,7 @@ static void usage(const char *reason) @@ -134,7 +134,7 @@ static void usage(const char *reason)
*/
int position_estimator_inav_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
usage("missing command");
}

3
src/modules/segway/segway_main.cpp

@ -92,8 +92,9 @@ usage(const char *reason) @@ -92,8 +92,9 @@ usage(const char *reason)
int segway_main(int argc, char *argv[])
{
if (argc < 1)
if (argc < 2) {
usage("missing command");
}
if (!strcmp(argv[1], "start")) {

2
src/modules/sensors/sensors.cpp

@ -2252,7 +2252,7 @@ Sensors::start() @@ -2252,7 +2252,7 @@ Sensors::start()
int sensors_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: sensors {start|stop|status}");
}

2
src/modules/vtol_att_control/vtol_att_control_main.cpp

@ -877,7 +877,7 @@ VtolAttitudeControl::start() @@ -877,7 +877,7 @@ VtolAttitudeControl::start()
int vtol_att_control_main(int argc, char *argv[])
{
if (argc < 1) {
if (argc < 2) {
errx(1, "usage: vtol_att_control {start|stop|status}");
}

Loading…
Cancel
Save