common/swaglog: remove trailing semicolon from macros (#29042)

pull/29051/head
Dean Lee 2 years ago committed by GitHub
parent 83c5d11dff
commit 269ceca27a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      common/gpio.cc
  2. 1
      common/swaglog.cc
  3. 6
      common/swaglog.h
  4. 2
      system/camerad/cameras/camera_qcom2.cc
  5. 2
      system/sensord/sensors/bmx055_accel.cc
  6. 2
      system/sensord/sensors/bmx055_gyro.cc
  7. 2
      system/sensord/sensors/bmx055_magn.cc
  8. 4
      system/sensord/sensors/lsm6ds3_accel.cc
  9. 4
      system/sensord/sensors/lsm6ds3_gyro.cc
  10. 2
      system/sensord/sensors/mmc5603nj_magn.cc
  11. 2
      system/ubloxd/ublox_msg.cc

@ -53,7 +53,7 @@ int gpiochip_get_ro_value_fd(const char* consumer_label, int gpiochiop_id, int p
std::string gpiochip_path = "/dev/gpiochip" + std::to_string(gpiochiop_id); std::string gpiochip_path = "/dev/gpiochip" + std::to_string(gpiochiop_id);
int fd = open(gpiochip_path.c_str(), O_RDONLY); int fd = open(gpiochip_path.c_str(), O_RDONLY);
if (fd < 0) { if (fd < 0) {
LOGE("Error opening gpiochip0 fd") LOGE("Error opening gpiochip0 fd");
return -1; return -1;
} }

@ -135,4 +135,3 @@ void cloudlog_te(int levelnum, const char* filename, int lineno, const char* fun
cloudlog_t_common(levelnum, filename, lineno, func, frame_id, fmt, args); cloudlog_t_common(levelnum, filename, lineno, func, frame_id, fmt, args);
va_end(args); va_end(args);
} }

@ -21,11 +21,11 @@ void cloudlog_te(int levelnum, const char* filename, int lineno, const char* fun
#define cloudlog(lvl, fmt, ...) cloudlog_e(lvl, __FILE__, __LINE__, \ #define cloudlog(lvl, fmt, ...) cloudlog_e(lvl, __FILE__, __LINE__, \
__func__, \ __func__, \
fmt, ## __VA_ARGS__); fmt, ## __VA_ARGS__)
#define cloudlog_t(lvl, ...) cloudlog_te(lvl, __FILE__, __LINE__, \ #define cloudlog_t(lvl, ...) cloudlog_te(lvl, __FILE__, __LINE__, \
__func__, \ __func__, \
__VA_ARGS__); __VA_ARGS__)
#define cloudlog_rl(burst, millis, lvl, fmt, ...) \ #define cloudlog_rl(burst, millis, lvl, fmt, ...) \

@ -496,7 +496,7 @@ void CameraState::enqueue_buffer(int i, bool dp) {
strcpy(sync_create.name, "NodeOutputPortFence"); strcpy(sync_create.name, "NodeOutputPortFence");
ret = do_cam_control(multi_cam_state->cam_sync_fd, CAM_SYNC_CREATE, &sync_create, sizeof(sync_create)); ret = do_cam_control(multi_cam_state->cam_sync_fd, CAM_SYNC_CREATE, &sync_create, sizeof(sync_create));
if (ret != 0) { if (ret != 0) {
LOGE("failed to create fence: %d %d", ret, sync_create.sync_obj) LOGE("failed to create fence: %d %d", ret, sync_create.sync_obj);
} }
sync_objs[i] = sync_create.sync_obj; sync_objs[i] = sync_create.sync_obj;

@ -44,7 +44,7 @@ int BMX055_Accel::shutdown() {
// enter deep suspend mode (lowest power mode) // enter deep suspend mode (lowest power mode)
int ret = set_register(BMX055_ACCEL_I2C_REG_PMU, BMX055_ACCEL_DEEP_SUSPEND); int ret = set_register(BMX055_ACCEL_I2C_REG_PMU, BMX055_ACCEL_DEEP_SUSPEND);
if (ret < 0) { if (ret < 0) {
LOGE("Could not move BMX055 ACCEL in deep suspend mode!") LOGE("Could not move BMX055 ACCEL in deep suspend mode!");
} }
return ret; return ret;

@ -54,7 +54,7 @@ int BMX055_Gyro::shutdown() {
// enter deep suspend mode (lowest power mode) // enter deep suspend mode (lowest power mode)
int ret = set_register(BMX055_GYRO_I2C_REG_LPM1, BMX055_GYRO_DEEP_SUSPEND); int ret = set_register(BMX055_GYRO_I2C_REG_LPM1, BMX055_GYRO_DEEP_SUSPEND);
if (ret < 0) { if (ret < 0) {
LOGE("Could not move BMX055 GYRO in deep suspend mode!") LOGE("Could not move BMX055 GYRO in deep suspend mode!");
} }
return ret; return ret;

@ -150,7 +150,7 @@ int BMX055_Magn::shutdown() {
// move to suspend mode // move to suspend mode
int ret = set_register(BMX055_MAGN_I2C_REG_PWR_0, 0); int ret = set_register(BMX055_MAGN_I2C_REG_PWR_0, 0);
if (ret < 0) { if (ret < 0) {
LOGE("Could not move BMX055 MAGN in suspend mode!") LOGE("Could not move BMX055 MAGN in suspend mode!");
} }
return ret; return ret;

@ -194,7 +194,7 @@ int LSM6DS3_Accel::shutdown() {
value &= ~(LSM6DS3_ACCEL_INT1_DRDY_XL); value &= ~(LSM6DS3_ACCEL_INT1_DRDY_XL);
ret = set_register(LSM6DS3_ACCEL_I2C_REG_INT1_CTRL, value); ret = set_register(LSM6DS3_ACCEL_I2C_REG_INT1_CTRL, value);
if (ret < 0) { if (ret < 0) {
LOGE("Could not disable lsm6ds3 acceleration interrupt!") LOGE("Could not disable lsm6ds3 acceleration interrupt!");
goto fail; goto fail;
} }
@ -208,7 +208,7 @@ int LSM6DS3_Accel::shutdown() {
value &= 0x0F; value &= 0x0F;
ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL1_XL, value); ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL1_XL, value);
if (ret < 0) { if (ret < 0) {
LOGE("Could not power-down lsm6ds3 accelerometer!") LOGE("Could not power-down lsm6ds3 accelerometer!");
goto fail; goto fail;
} }

@ -177,7 +177,7 @@ int LSM6DS3_Gyro::shutdown() {
value &= ~(LSM6DS3_GYRO_INT1_DRDY_G); value &= ~(LSM6DS3_GYRO_INT1_DRDY_G);
ret = set_register(LSM6DS3_GYRO_I2C_REG_INT1_CTRL, value); ret = set_register(LSM6DS3_GYRO_I2C_REG_INT1_CTRL, value);
if (ret < 0) { if (ret < 0) {
LOGE("Could not disable lsm6ds3 gyroscope interrupt!") LOGE("Could not disable lsm6ds3 gyroscope interrupt!");
goto fail; goto fail;
} }
@ -191,7 +191,7 @@ int LSM6DS3_Gyro::shutdown() {
value &= 0x0F; value &= 0x0F;
ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL2_G, value); ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL2_G, value);
if (ret < 0) { if (ret < 0) {
LOGE("Could not power-down lsm6ds3 gyroscope!") LOGE("Could not power-down lsm6ds3 gyroscope!");
goto fail; goto fail;
} }

@ -63,7 +63,7 @@ int MMC5603NJ_Magn::shutdown() {
return ret; return ret;
fail: fail:
LOGE("Could not disable mmc5603nj auto set reset") LOGE("Could not disable mmc5603nj auto set reset");
return ret; return ret;
} }

@ -390,7 +390,7 @@ kj::Array<capnp::word> UbloxMsgParser::parse_glonass_ephemeris(ubx_t::rxm_sfrbx_
eph.setP4(data->p4()); eph.setP4(data->p4());
eph.setSvURA(glonass_URA_lookup.at(data->f_t())); eph.setSvURA(glonass_URA_lookup.at(data->f_t()));
if (msg->sv_id() != data->n()) { if (msg->sv_id() != data->n()) {
LOGE("SV_ID != SLOT_NUMBER: %d %d", msg->sv_id(), data->n()) LOGE("SV_ID != SLOT_NUMBER: %d %d", msg->sv_id(), data->n());
} }
eph.setSvType(data->m()); eph.setSvType(data->m());
} }

Loading…
Cancel
Save