!1423 挑单 https://gitee.com/openharmony/startup_init_lite/pulls/1408 到monthly_20221018分支

Merge pull request !1423 from cheng_jinsong/cherry-pick-1666579707

interfaces/innerkits/include/beget_ext.h

@@ -47,15 +47,10 @@ typedef enum InitLogLevel {
     INIT_FATAL
 } InitLogLevel;
 
-typedef void (*InitCommLog)(int logLevel, uint32_t domain, const char *tag, const char *fmt, va_list vargs);
 #define FILE_NAME   (strrchr((__FILE__), '/') ? strrchr((__FILE__), '/') + 1 : (__FILE__))
 
 INIT_PUBLIC_API void StartupLog(InitLogLevel logLevel, uint32_t domain, const char *tag, const char *fmt, ...);
-INIT_PUBLIC_API void EnableInitLog(InitLogLevel level);
 INIT_PUBLIC_API void SetInitLogLevel(InitLogLevel level);
-INIT_PUBLIC_API int GetInitLogLevel(void);
-INIT_PUBLIC_API void SetInitCommLog(InitCommLog logFunc);
-INIT_PUBLIC_API void EnableInitLogFromCmdline(void);
 
 #define STARTUP_LOGV(domain, tag, fmt, ...) \
     StartupLog(INIT_DEBUG, domain, tag, "[%s:%d]" fmt, (FILE_NAME), (__LINE__), ##__VA_ARGS__)

services/begetctl/setloglevel.c

@@ -17,6 +17,7 @@
 #include <stdlib.h>
 
 #include "begetctl.h"
+#include "init_log.h"
 #include "init_utils.h"
 #include "init_param.h"
 #include "securec.h"
@@ -53,9 +54,9 @@ static int32_t GetInitLogLevelFromParam(BShellHandle shell, int argc, char **arg
     uint32_t len = sizeof(logLevel);
     int ret = SystemReadParam("persist.init.debug.loglevel", logLevel, &len);
     if (ret == 0) {
-        printf("Success to get init log level: %s from param \"persist.init.debug.loglevel\" \n", logLevel);
+        printf("Success to get init log level: %s from param \"persist.init.debug.loglevel\". \n", logLevel);
     } else {
-        printf("Failed to get init log level from param, keep the system origin log level: %d.\n", GetInitLogLevel());
+        printf("Failed to get init log level from param, keep the system origin log level. \n");
     }
     return 0;
 }

services/log/init_commlog.c

@@ -16,7 +16,7 @@
 #include "init_log.h"
 
 static InitCommLog g_initCommLog = NULL;
-INIT_PUBLIC_API void SetInitCommLog(InitCommLog logFunc)
+INIT_LOCAL_API void SetInitCommLog(InitCommLog logFunc)
 {
     g_initCommLog = logFunc;
 }

services/log/init_log.c

@@ -140,18 +140,13 @@ INIT_PUBLIC_API void SetInitLogLevel(InitLogLevel level)
     return;
 }
 
-INIT_PUBLIC_API  int GetInitLogLevel(void)
-{
-    return g_logLevel;
-}
-
-INIT_PUBLIC_API void EnableInitLog(InitLogLevel level)
+INIT_LOCAL_API void EnableInitLog(InitLogLevel level)
 {
     g_logLevel = level;
     SetInitCommLog(InitLog);
 }
 
-INIT_PUBLIC_API void EnableInitLogFromCmdline(void)
+INIT_LOCAL_API void EnableInitLogFromCmdline(void)
 {
     SetInitCommLog(InitLog);
     char level[MAX_BUFFER_LEN] = {0};

services/log/init_log.h

@@ -36,8 +36,13 @@ extern "C" {
 #define INIT_LOG_DOMAIN (BASE_DOMAIN + 1)
 #endif
 
+typedef void (*InitCommLog)(int logLevel, uint32_t domain, const char *tag, const char *fmt, va_list vargs);
+
 INIT_LOCAL_API void OpenLogDevice(void);
 INIT_LOCAL_API void InitLog(int logLevel, unsigned int domain, const char *tag, const char *fmt, va_list vargs);
+INIT_LOCAL_API void SetInitCommLog(InitCommLog logFunc);
+INIT_LOCAL_API void EnableInitLog(InitLogLevel level);
+INIT_LOCAL_API void EnableInitLogFromCmdline(void);
 
 #ifdef PARAM_BASE
 #define INIT_LOGV(fmt, ...)

services/param/linux/param_request.c

@@ -21,9 +21,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#ifdef PARAM_BASE_LOG
 #include "init_log.h"
-#endif
 #include "init_utils.h"
 #include "param_base.h"
 #include "param_manager.h"

services/param/liteos/param_client.c

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "init_log.h"
 #include "init_param.h"
 #include "param_manager.h"
 

services/param/liteos/param_service.c

@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include "init_log.h"
 #include "init_param.h"
 #include "init_utils.h"
 #include "param_manager.h"

test/unittest/lite/cmd_func_test.cpp

@@ -21,10 +21,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "beget_ext.h"
 #include "cJSON.h"
 #include "init_cmds.h"
 #include "init_jobs_internal.h"
+#include "init_log.h"
 #include "init_service_manager.h"
 #include "param_stub.h"
 #include "securec.h"

test/unittest/param/param_stub.cpp

@@ -15,7 +15,7 @@
 
 #include "param_stub.h"
 #include <dirent.h>
-#include "beget_ext.h"
+#include "init_log.h"
 #include "init_param.h"
 #include "param_manager.h"
 #include "param_security.h"