Merge pull request #280 from pradeeptakdas/RDKBDEV-2936

RDKBDEV-2936: drop syscfg_init() as a public API
xmidt-org · Nov 4, 2024 · 6d195f3 · 6d195f3
2 parents 039fa62 + 608f753
commit 6d195f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/source/broadband/webpa_internal.c b/source/broadband/webpa_internal.c
@@ -20,6 +20,9 @@
 #endif
 
 #include <cJSON.h>
+#ifdef RDKB_BUILD
+#include <syscfg/syscfg.h>
+#endif
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
@@ -1431,15 +1434,12 @@ WDMP_STATUS check_ethernet_wan_status()
     char *status = NULL;
     char isEthEnabled[64]={'\0'};
 #ifdef RDKB_BUILD
-    if(0 == syscfg_init())
+    if( 0 == syscfg_get( NULL, "eth_wan_enabled", isEthEnabled, sizeof(isEthEnabled)) && (isEthEnabled[0] != '\0' && strncmp(isEthEnabled, "true", strlen("true")) == 0))
     {
-        if( 0 == syscfg_get( NULL, "eth_wan_enabled", isEthEnabled, sizeof(isEthEnabled)) && (isEthEnabled[0] != '\0' && strncmp(isEthEnabled, "true", strlen("true")) == 0))
-        {
-            WalInfo("Ethernet WAN is enabled\n");
-            OnboardLog("Ethernet WAN is enabled\n");
-            eth_wan_status = TRUE;
-            return WDMP_SUCCESS;
-        }
+        WalInfo("Ethernet WAN is enabled\n");
+        OnboardLog("Ethernet WAN is enabled\n");
+        eth_wan_status = TRUE;
+        return WDMP_SUCCESS;
     }
     else
 #endif

diff --git a/source/broadband/webpa_notification.c b/source/broadband/webpa_notification.c
@@ -714,14 +714,9 @@ static void getNotifyParamList(const char ***paramList, int *size)
     	    }
 	    char meshEnable[64];
 	    memset(meshEnable, 0, sizeof(meshEnable));
-	    if(0 == syscfg_init())
-	    {
-		    syscfg_get( NULL, "mesh_enable", meshEnable, sizeof(meshEnable));
-	    }
-	    else
-	    {
-		    WalError("syscfg_init failed\n");
-	    }
+	    if(syscfg_get( NULL, "mesh_enable", meshEnable, sizeof(meshEnable))!=0)
+	        WalError("syscfg_get failed\n"); 
+
 	    if(meshEnable[0] != '\0' && strncmp(meshEnable, "true", strlen("true")) == 0)
 	    {
 		    WalInfo("Mesh/plume is enabled\n");