From edc96dede9d970137c01e544ab977b9856e26111 Mon Sep 17 00:00:00 2001 From: sunxuejiao Date: Wed, 25 Aug 2021 09:55:53 +0800 Subject: [PATCH 1/2] modify the security coding specification in header file Signed-off-by: sunxuejiao --- model/misc/vibrator/driver/chipset/vibrator_linear_driver.c | 4 ++-- model/misc/vibrator/driver/src/vibrator_driver.c | 2 +- model/misc/vibrator/driver/src/vibrator_haptic.c | 2 +- model/sensor/driver/accel/sensor_accel_driver.c | 2 +- model/sensor/driver/chipset/accel/accel_bmi160.c | 2 +- model/sensor/driver/chipset/gyro/gyro_bmi160.c | 2 +- model/sensor/driver/common/src/sensor_config_controller.c | 2 +- model/sensor/driver/common/src/sensor_config_parser.c | 2 +- model/sensor/driver/common/src/sensor_device_manager.c | 2 +- model/sensor/driver/common/src/sensor_platform_if.c | 2 +- model/sensor/driver/gyro/sensor_gyro_driver.c | 2 +- test/unittest/sensor/hdf_sensor_test.c | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c b/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c index f58e6ecaa..82b32e871 100644 --- a/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c +++ b/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c @@ -6,15 +6,15 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "vibrator_linear_driver.h" +#include "securec.h" #include "device_resource_if.h" #include "gpio_if.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" -#include "securec.h" #include "vibrator_driver.h" #include "vibrator_driver_type.h" -#include "vibrator_linear_driver.h" #define HDF_LOG_TAG vibrator_linear_driver_c diff --git a/model/misc/vibrator/driver/src/vibrator_driver.c b/model/misc/vibrator/driver/src/vibrator_driver.c index 5e8be1847..3b6d34423 100644 --- a/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/model/misc/vibrator/driver/src/vibrator_driver.c @@ -6,11 +6,11 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "vibrator_driver.h" #include "securec.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" -#include "vibrator_driver.h" #include "vibrator_haptic.h" #define HDF_LOG_TAG vibrator_driver_c diff --git a/model/misc/vibrator/driver/src/vibrator_haptic.c b/model/misc/vibrator/driver/src/vibrator_haptic.c index 9bd5ae451..b44049579 100644 --- a/model/misc/vibrator/driver/src/vibrator_haptic.c +++ b/model/misc/vibrator/driver/src/vibrator_haptic.c @@ -6,13 +6,13 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "vibrator_haptic.h" #include "securec.h" #include "device_resource_if.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" #include "vibrator_driver.h" -#include "vibrator_haptic.h" #define HDF_LOG_TAG vibrator_haptic_c #define VIBRATOR_HAPTIC_STACK_SIZE 0x4000 diff --git a/model/sensor/driver/accel/sensor_accel_driver.c b/model/sensor/driver/accel/sensor_accel_driver.c index ab62901fc..14b86a86c 100644 --- a/model/sensor/driver/accel/sensor_accel_driver.c +++ b/model/sensor/driver/accel/sensor_accel_driver.c @@ -6,13 +6,13 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_accel_driver.h" #include "securec.h" #include "accel_bmi160.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_math.h" #include "osal_mem.h" -#include "sensor_accel_driver.h" #include "sensor_config_controller.h" #include "sensor_device_manager.h" #include "sensor_platform_if.h" diff --git a/model/sensor/driver/chipset/accel/accel_bmi160.c b/model/sensor/driver/chipset/accel/accel_bmi160.c index afb0755d0..f2754af0f 100644 --- a/model/sensor/driver/chipset/accel/accel_bmi160.c +++ b/model/sensor/driver/chipset/accel/accel_bmi160.c @@ -6,8 +6,8 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" #include "accel_bmi160.h" +#include "securec.h" #include "osal_time.h" #include "sensor_accel_driver.h" #include "sensor_config_controller.h" diff --git a/model/sensor/driver/chipset/gyro/gyro_bmi160.c b/model/sensor/driver/chipset/gyro/gyro_bmi160.c index f044a6503..3b4b24e77 100644 --- a/model/sensor/driver/chipset/gyro/gyro_bmi160.c +++ b/model/sensor/driver/chipset/gyro/gyro_bmi160.c @@ -6,8 +6,8 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" #include "gyro_bmi160.h" +#include "securec.h" #include "osal_time.h" #include "sensor_gyro_driver.h" #include "sensor_config_controller.h" diff --git a/model/sensor/driver/common/src/sensor_config_controller.c b/model/sensor/driver/common/src/sensor_config_controller.c index 777aac60a..2627210cf 100644 --- a/model/sensor/driver/common/src/sensor_config_controller.c +++ b/model/sensor/driver/common/src/sensor_config_controller.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_config_controller.h" #include "securec.h" #include "osal_mem.h" #include "osal_time.h" -#include "sensor_config_controller.h" #include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_config_controller_c diff --git a/model/sensor/driver/common/src/sensor_config_parser.c b/model/sensor/driver/common/src/sensor_config_parser.c index c844da6f8..90e5ecd99 100644 --- a/model/sensor/driver/common/src/sensor_config_parser.c +++ b/model/sensor/driver/common/src/sensor_config_parser.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_config_parser.h" #include "securec.h" #include "device_resource_if.h" #include "osal_mem.h" -#include "sensor_config_parser.h" #include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_config_parser_c diff --git a/model/sensor/driver/common/src/sensor_device_manager.c b/model/sensor/driver/common/src/sensor_device_manager.c index 45d6c7b75..8511608c5 100644 --- a/model/sensor/driver/common/src/sensor_device_manager.c +++ b/model/sensor/driver/common/src/sensor_device_manager.c @@ -6,12 +6,12 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_device_manager.h" #include "asm/io.h" #include "securec.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" -#include "sensor_device_manager.h" #include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_device_manager_c diff --git a/model/sensor/driver/common/src/sensor_platform_if.c b/model/sensor/driver/common/src/sensor_platform_if.c index fe7e81f6d..3c9bf124f 100644 --- a/model/sensor/driver/common/src/sensor_platform_if.c +++ b/model/sensor/driver/common/src/sensor_platform_if.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_platform_if.h" #include "securec.h" #include "osal_io.h" #include "osal_time.h" -#include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_platform_if_c diff --git a/model/sensor/driver/gyro/sensor_gyro_driver.c b/model/sensor/driver/gyro/sensor_gyro_driver.c index 290b0f4c5..8323e6554 100644 --- a/model/sensor/driver/gyro/sensor_gyro_driver.c +++ b/model/sensor/driver/gyro/sensor_gyro_driver.c @@ -6,13 +6,13 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_gyro_driver.h" #include "securec.h" #include "gyro_bmi160.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_math.h" #include "osal_mem.h" -#include "sensor_gyro_driver.h" #include "sensor_config_controller.h" #include "sensor_device_manager.h" #include "sensor_platform_if.h" diff --git a/test/unittest/sensor/hdf_sensor_test.c b/test/unittest/sensor/hdf_sensor_test.c index ce89c9eb3..65df232ac 100644 --- a/test/unittest/sensor/hdf_sensor_test.c +++ b/test/unittest/sensor/hdf_sensor_test.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "hdf_sensor_test.h" #include #include "hdf_base.h" #include "hdf_device_desc.h" -#include "hdf_sensor_test.h" #include "osal_math.h" #include "osal_time.h" #include "sensor_platform_if.h" -- Gitee From 54bf69e1bc251d9762faebabb26db94d03285e4e Mon Sep 17 00:00:00 2001 From: sunxuejiao Date: Wed, 25 Aug 2021 10:48:01 +0800 Subject: [PATCH 2/2] modify the security coding specification in header file Signed-off-by: sunxuejiao --- model/misc/vibrator/driver/src/vibrator_haptic.c | 2 +- model/sensor/driver/common/src/sensor_config_parser.c | 2 +- model/sensor/driver/gyro/sensor_gyro_driver.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/model/misc/vibrator/driver/src/vibrator_haptic.c b/model/misc/vibrator/driver/src/vibrator_haptic.c index b44049579..d4c7f098b 100644 --- a/model/misc/vibrator/driver/src/vibrator_haptic.c +++ b/model/misc/vibrator/driver/src/vibrator_haptic.c @@ -7,8 +7,8 @@ */ #include "vibrator_haptic.h" -#include "securec.h" #include "device_resource_if.h" +#include "securec.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" diff --git a/model/sensor/driver/common/src/sensor_config_parser.c b/model/sensor/driver/common/src/sensor_config_parser.c index 90e5ecd99..6747cc7ee 100644 --- a/model/sensor/driver/common/src/sensor_config_parser.c +++ b/model/sensor/driver/common/src/sensor_config_parser.c @@ -7,8 +7,8 @@ */ #include "sensor_config_parser.h" -#include "securec.h" #include "device_resource_if.h" +#include "securec.h" #include "osal_mem.h" #include "sensor_platform_if.h" diff --git a/model/sensor/driver/gyro/sensor_gyro_driver.c b/model/sensor/driver/gyro/sensor_gyro_driver.c index 8323e6554..aa097ba6e 100644 --- a/model/sensor/driver/gyro/sensor_gyro_driver.c +++ b/model/sensor/driver/gyro/sensor_gyro_driver.c @@ -7,10 +7,10 @@ */ #include "sensor_gyro_driver.h" -#include "securec.h" #include "gyro_bmi160.h" #include "hdf_base.h" #include "hdf_device_desc.h" +#include "securec.h" #include "osal_math.h" #include "osal_mem.h" #include "sensor_config_controller.h" -- Gitee