fix: 头文件引用整改

Signed-off-by: shipengtao9579 <shipengtao@huawei.com>
Change-Id: I4ac5a3b2daf6744be1e4641912a96e3e983a31ec

baselib/msglib/src/standard/messenger_device_session_manager.c

@@ -19,14 +19,15 @@
 #include "securec.h"
 #include "session.h"
 #include "softbus_bus_center.h"
+#include "softbus_common.h"
+
+#include "messenger_device_status_manager.h"
+#include "messenger_utils.h"
 #include "utils_list.h"
 #include "utils_log.h"
 #include "utils_mem.h"
 #include "utils_mutex.h"
 
-#include "messenger_device_status_manager.h"
-#include "messenger_utils.h"
-
 #define IS_SERVER 0
 
 static int MessengerOnSessionOpened(int sessionId, int result);

baselib/msglib/src/standard/messenger_device_session_manager.h

@@ -18,6 +18,9 @@
 
 #include "messenger.h"
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #include "utils_work_queue.h"
 
 #ifdef __cplusplus

baselib/msglib/src/standard/messenger_device_status_manager.c

@@ -17,9 +17,11 @@
 
 #include <stdlib.h>
 
-#include "messenger_utils.h"
 #include "securec.h"
 #include "softbus_bus_center.h"
+#include "softbus_common.h"
+
+#include "messenger_utils.h"
 #include "utils_log.h"
 #include "utils_mem.h"
 
@@ -185,7 +187,7 @@ bool InitDeviceStatusManager(WorkQueue *queue, const char *pkgName, DeviceStatus
     return true;
 }
 
-bool DeInitDeviceStatusManager()
+bool DeInitDeviceStatusManager(void)
 {
     DeviceStatusManager *instance = GetDeviceManagerInstance();
 

baselib/msglib/src/standard/messenger_device_status_manager.h

@@ -16,8 +16,10 @@
 #ifndef SEC_MESSENGER_DEVICE_STATUS_MANAGER_H
 #define SEC_MESSENGER_DEVICE_STATUS_MANAGER_H
 
-#include "messenger.h"
+#include <stdint.h>
+#include <stdbool.h>
 
+#include "messenger.h"
 #include "utils_work_queue.h"
 
 #ifdef __cplusplus
@@ -26,7 +28,7 @@ extern "C" {
 
 bool InitDeviceStatusManager(WorkQueue *queue, const char *pkgName, DeviceStatusReceiver deviceStatusReceiver);
 
-bool DeInitDeviceStatusManager();
+bool DeInitDeviceStatusManager(void);
 
 bool MessengerGetDeviceOnlineStatus(const DeviceIdentify *devId, uint32_t *devType);
 

baselib/msglib/src/standard/messenger_impl.c

@@ -15,16 +15,16 @@
 
 #include "messenger_impl.h"
 
+#include <stdint.h>
 #include <stdlib.h>
-
-#include "securec.h"
-#include "utils_log.h"
-#include "utils_mem.h"
-#include "utils_work_queue.h"
+#include <stdbool.h>
 
 #include "messenger.h"
 #include "messenger_device_session_manager.h"
 #include "messenger_device_status_manager.h"
+#include "utils_log.h"
+#include "utils_mem.h"
+#include "utils_work_queue.h"
 
 #define MESSENGER_MAGIC_HEAD 0x1234abcd
 #define MESSENGER_PROCESS_QUEUE_SIZE 256

baselib/utils/src/utils_base64.c

@@ -15,10 +15,12 @@
 
 #include "utils_base64.h"
 
-#include <securec.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 
+#include "securec.h"
+
 #include "utils_log.h"
 #include "utils_mem.h"
 

baselib/utils/src/utils_hexstring.c

@@ -15,7 +15,6 @@
 
 #include "utils_hexstring.h"
 
-#include <stdbool.h>
 #include <stdio.h>
 
 #include "utils_log.h"

baselib/utils/src/utils_json.c

@@ -15,6 +15,8 @@
 
 #include "utils_json.h"
 
+#include <stddef.h>
+
 #include "cJSON.h"
 
 #ifdef __cplusplus

baselib/utils/src/utils_timer.cpp

@@ -15,11 +15,13 @@
 
 #include "utils_timer.h"
 
+#include <new>
+#include <functional>
+
+#include "nocopyable.h"
 #include "singleton.h"
 #include "timer.h"
 
-#include "utils_log.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

baselib/utils/src/utils_tlv.c

@@ -15,7 +15,9 @@
 
 #include "utils_tlv.h"
 
-#include <securec.h>
+#include <stddef.h>
+
+#include "securec.h"
 
 #define TLV_TAG_LEN sizeof(uint16_t)
 #define TLV_LENGTH_LEN sizeof(uint16_t)

baselib/utils/src/utils_work_queue.c

@@ -15,10 +15,11 @@
 
 #include "utils_work_queue.h"
 
+#include <stddef.h>
 #include <pthread.h>
 #include <sys/prctl.h>
 
-#include <securec.h>
+#include "securec.h"
 
 #include "utils_list.h"
 #include "utils_mem.h"

interfaces/inner_api/src/standard/device_security_level_callback_stub.h

@@ -16,9 +16,11 @@
 #ifndef DEVICE_SECURITY_LEVEL_CALLBACK_STUB
 #define DEVICE_SECURITY_LEVEL_CALLBACK_STUB
 
+#include <stdint.h>
 #include <functional>
-#include <mutex>
 
+#include "errors.h"
+#include "refbase.h"
 #include "iremote_stub.h"
 #include "nocopyable.h"
 

interfaces/inner_api/src/standard/device_security_level_proxy.cpp

@@ -15,8 +15,13 @@
 
 #include "device_security_level_proxy.h"
 
-#include "hilog/log.h"
+#include "ipc_types.h"
+#include "iremote_object.h"
+#include "message_option.h"
+#include "message_parcel.h"
+#include "hilog/log_cpp.h"
 
+#include "idevice_security_level.h"
 #include "device_security_level_defines.h"
 namespace OHOS {
 namespace Security {

interfaces/inner_api/src/standard/device_security_level_proxy.h

@@ -16,12 +16,17 @@
 #ifndef DEVICE_SECURITY_LEVEL_PROXY
 #define DEVICE_SECURITY_LEVEL_PROXY
 
+#include <cstdint>
+#include <functional>
+
+#include "errors.h"
+#include "refbase.h"
+#include "iremote_broker.h"
 #include "iremote_proxy.h"
 #include "nocopyable.h"
 
-#include "idevice_security_level.h"
-
 #include "device_security_defines.h"
+#include "idevice_security_level.h"
 
 namespace OHOS {
 namespace Security {

oem_property/common/dslm_credential_utils.c

@@ -15,13 +15,17 @@
 
 #include "dslm_credential_utils.h"
 
-#include <securec.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <string.h>
 
+#include <openssl/ossl_typ.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "securec.h"
+
+#include "device_security_defines.h"
 #include "utils_base64.h"
 #include "utils_json.h"
 #include "utils_log.h"
@@ -205,7 +209,7 @@ static bool VerifyCredentialCb(const CredentialCb *credCb)
         return false;
     }
     SECURITY_LOG_INFO("verify payload success");
-    
+
     return true;
 }
 

oem_property/ohos/impl/dslm_ohos_init.c

@@ -14,12 +14,13 @@
  */
 
 #include "dslm_ohos_init.h"
-#include "dslm_credential_utils.h"
-#include "dslm_ohos_request.h"
 
 #include <string.h>
 
 #include "utils_log.h"
+#include "dslm_credential_utils.h"
+#include "dslm_ohos_request.h"
+#include "device_security_defines.h"
 
 #define DSLM_CRED_STR_LEN_MAX 4096
 

oem_property/ohos/impl/dslm_ohos_init.h

@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 
-#include "device_security_defines.h"
 #include "dslm_cred.h"
 
 #ifdef __cplusplus

oem_property/ohos/impl/dslm_ohos_request.c

@@ -14,12 +14,14 @@
  */
 
 #include "dslm_ohos_request.h"
-#include "dslm_messenger_wrapper.h"
-#include "external_interface_adapter.h"
 
-#include <securec.h>
+#include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 
+#include "securec.h"
+
+#include "external_interface_adapter.h"
 #include "utils_hexstring.h"
 #include "utils_json.h"
 #include "utils_log.h"

oem_property/ohos/impl/dslm_ohos_verify.c

@@ -15,18 +15,18 @@
 
 #include "dslm_ohos_verify.h"
 
-#include <securec.h>
+#include <stdbool.h>
 #include <string.h>
 
+#include "securec.h"
+
+#include "dslm_credential_utils.h"
+#include "external_interface_adapter.h"
 #include "utils_hexstring.h"
 #include "utils_json.h"
 #include "utils_log.h"
 #include "utils_mem.h"
 
-#include "dslm_credential_utils.h"
-#include "dslm_crypto.h"
-#include "external_interface_adapter.h"
-
 #define UDID_STRING_LENGTH 65
 
 #define CRED_MAX_LEVEL_TYPE_SMALL 2

oem_property/ohos/impl/external_interface_adapter.c

@@ -14,16 +14,21 @@
  */
 
 #include "external_interface_adapter.h"
-#include "device_security_defines.h"
 
-#include <securec.h>
+#include <stddef.h>
+#include <string.h>
 
-#include "device_auth.h"
+#include "securec.h"
+#include "hks_api.h"
+#include "hks_param.h"
+#include "hks_type.h"
 #include "hks_adapter.h"
+#include "device_auth.h"
+
+#include "device_security_defines.h"
 #include "utils_json.h"
 #include "utils_log.h"
 #include "utils_mem.h"
-#include "utils_tlv.h"
 
 const char g_dslmKey[] = "dslm_key";
 

oem_property/ohos/impl/hks_adapter.c

@@ -15,14 +15,14 @@
 
 #include "hks_adapter.h"
 
-#include "external_interface_adapter.h"
-#include "device_security_defines.h"
+#include <stddef.h>
 
-#include <securec.h>
-#include "device_auth.h"
+#include "securec.h"
 #include "hks_api.h"
+#include "hks_type.h"
 #include "hks_param.h"
-#include "utils_json.h"
+
+#include "device_security_defines.h"
 #include "utils_log.h"
 #include "utils_mem.h"
 #include "utils_tlv.h"

services/common/dslm_crypto.c

@@ -15,11 +15,10 @@
 
 #include "dslm_crypto.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <openssl/rand.h>
 
-#include "device_security_defines.h"
-#include "utils_log.h"
-
 void GenerateRandom(RandomValue *rand, uint32_t length)
 {
     if (rand == NULL) {

services/common/dslm_msg_serialize.c

@@ -15,10 +15,13 @@
 
 #include "dslm_msg_serialize.h"
 
-#include <securec.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 
+#include "securec.h"
+
 #include "utils_json.h"
 #include "utils_log.h"
 #include "utils_mem.h"

services/dslm/dslm_core_process.c

@@ -15,14 +15,22 @@
 
 #include "dslm_core_process.h"
 
-#include <securec.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <unistd.h>
+#include <stdbool.h>
 
+#include "securec.h"
+
+#include "utils_mutex.h"
+#include "utils_state_machine.h"
 #include "utils_datetime.h"
 #include "utils_log.h"
-#include "utils_mem.h"
-#include "utils_timer.h"
-
+#include "device_security_defines.h"
+#include "dslm_core_defines.h"
+#include "dslm_callback_info.h"
+#include "dslm_cred.h"
+#include "dslm_msg_serialize.h"
 #include "dslm_credential.h"
 #include "dslm_device_list.h"
 #include "dslm_fsm_process.h"

services/dslm/dslm_credential.c

@@ -15,7 +15,6 @@
 
 #include "dslm_credential.h"
 
-#include <dlfcn.h>
 #include <stdbool.h>
 #include <string.h>
 

services/dslm/dslm_credential.h

@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 
+#include "device_security_defines.h"
 #include "dslm_cred.h"
 
 #ifdef __cplusplus

services/dslm/dslm_device_list.c

@@ -15,18 +15,20 @@
 
 #include "dslm_device_list.h"
 
-#include <securec.h>
-#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
-#include "utils_datetime.h"
-#include "utils_list.h"
-#include "utils_log.h"
-#include "utils_mem.h"
-#include "utils_mutex.h"
+#include "securec.h"
 
 #include "device_security_defines.h"
 #include "dslm_core_defines.h"
 #include "dslm_fsm_process.h"
+#include "utils_list.h"
+#include "utils_log.h"
+#include "utils_mem.h"
+#include "utils_mutex.h"
+#include "utils_state_machine.h"
 
 #define MAX_DEVICE_CNT 128
 

services/dslm/dslm_hievent.c

@@ -15,8 +15,14 @@
 
 #include "dslm_hievent.h"
 
-#include <securec.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include "securec.h"
+
+#include "device_security_defines.h"
+#include "dslm_core_defines.h"
+#include "dslm_cred.h"
 #include "dslm_bigdata.h"
 
 void ReportHiEventInfoSync(const DslmDeviceInfo *info)

services/dslm/dslm_hievent.h

@@ -16,8 +16,6 @@
 #ifndef DSLM_BIGDATA_EVENT_H
 #define DSLM_BIGDATA_EVENT_H
 
-#include <stdint.h>
-
 #include "dslm_core_defines.h"
 
 #ifdef __cplusplus

services/dslm/dslm_inner_process.c

@@ -15,17 +15,19 @@
 
 #include "dslm_inner_process.h"
 
-#include <securec.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "device_security_defines.h"
 #include "utils_datetime.h"
 #include "utils_log.h"
-
+#include "utils_state_machine.h"
+#include "dslm_core_defines.h"
 #include "dslm_credential.h"
 #include "dslm_crypto.h"
 #include "dslm_messenger_wrapper.h"
 #include "dslm_msg_utils.h"
+#include "dslm_cred.h"
 
 #ifdef __cplusplus
 extern "C" {

services/dslm/dslm_inner_process.h

@@ -16,7 +16,6 @@
 #ifndef DSLM_INNER_PROCESS_H
 #define DSLM_INNER_PROCESS_H
 
-#include <stdbool.h>
 #include <stdint.h>
 
 #include "dslm_core_defines.h"

services/dslm/dslm_msg_utils.c

@@ -15,19 +15,19 @@
 
 #include "dslm_msg_utils.h"
 
-#include <securec.h>
 #include <string.h>
 
+#include "securec.h"
+
+#include "device_security_defines.h"
+#include "dslm_core_defines.h"
+#include "dslm_credential.h"
 #include "utils_base64.h"
 #include "utils_hexstring.h"
 #include "utils_json.h"
 #include "utils_log.h"
 #include "utils_mem.h"
 
-#include "device_security_defines.h"
-#include "dslm_core_defines.h"
-#include "dslm_credential.h"
-
 #define CHALLENGE_STRING_LENGTH 32
 
 static uint8_t *GenerateSecInfoResponseJson(uint64_t challenge, const DslmCredBuff *cred)

services/msg/dslm_messenger_wrapper.c

@@ -15,9 +15,13 @@
 
 #include "dslm_messenger_wrapper.h"
 
-#include "messenger.h"
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 
+#include "messenger.h"
 #include "utils_mutex.h"
+#include "device_security_defines.h"
 
 #define PKG_NAME "ohos.dslm"
 #define SESSION_NAME "device.security.level"

services/sa/standard/dslm_callback_proxy.cpp

@@ -17,9 +17,8 @@
 
 #include <mutex>
 
-#include "utils_log.h"
-
 #include "device_security_defines.h"
+#include "utils_log.h"
 
 namespace OHOS {
 namespace Security {

services/sa/standard/dslm_ipc_process.cpp

@@ -16,13 +16,13 @@
 #include "dslm_ipc_process.h"
 
 #include <ipc_skeleton.h>
-#include <securec.h>
 #include <string_ex.h>
 
-#include "utils_log.h"
+#include "securec.h"
 
 #include "dslm_callback_proxy.h"
 #include "dslm_core_process.h"
+#include "utils_log.h"
 
 namespace {
 constexpr uint32_t DFT_TIMEOUT = 45;