cleanup: remove unused code / declarations causing warnings

Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

18 files changed, 4 insertions, 147 deletions

diff --git a/InfraStack/OSAgnostic/Common/CommonServices/Services_Ctrl.h b/InfraStack/OSAgnostic/Common/CommonServices/Services_Ctrl.h
index e9ce1fe..577f575 100644
--- a/InfraStack/OSAgnostic/Common/CommonServices/Services_Ctrl.h
+++ b/InfraStack/OSAgnostic/Common/CommonServices/Services_Ctrl.h
@@ -33,41 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "wimax_osal_types.h"
 
-static char* SystemStates[] = {
-	"Uninit",
-	"Init",
-	"Ready",
-	"Scan",
-	"Standby",
-	"Connecting",
-	"Wimax_Connected",
-	"Data_Path_Connected",
-	"Idle",
-	"Disconnecting",
-	"Out_Of_Zone",
-	"Sleep_Active",
-	"Producation",
-	"Config",
-	"RF_Off",
-	"RF_Shutdown"
-};
-
-static char *L4ResponseStatus[] = {
-	"L3L4_RESPONSE_STATUS_SUCCESS_DONE",
-	"L3L4_RESPONSE_STATUS_SUCCESS_IN_PROCESS",
-	"L3L4_RESPONSE_STATUS_INVALID_OPCODE",
-	"L3L4_RESPONSE_STATUS_ERROR_BAD_STATE",
-	"L3L4_RESPONSE_STATUS_ILLEGAL_VALUE",
-	"L3L4_RESPONSE_STATUS_MISSING_PARAMS",
-	"L3L4_RESPONSE_STATUS_VERSION_ERROR",
-	"L3L4_RESPONSE_STATUS_ACCESSIBILITY_ERROR",
-	"L3L4_RESPONSE_STATUS_BUSY",
-	"L3L4_RESPONSE_STATUS_CORRUPTED_TLV",
-	"L3L4_RESPONSE_STATUS_UNINITIALIZED",
-	"L3L4_RESPONSE_STATUS_UNKNOWN_ERROR",
-	"L3L4_RESPONSE_STATUS_PRODUCTION_ERROR"
-};
-
 
 BOOL Services_Init();
 void Services_Fini();
@@ -75,4 +40,4 @@ void Services_Fini();
 char* GetL4Opcode(void *buffer);
 char* GetL4Indication(UINT16 indCode);
 
-#endif // _SERVICES_CTRL_H
\ No newline at end of file
+#endif // _SERVICES_CTRL_H
diff --git a/InfraStack/OSAgnostic/Product/AppSrvInfra/Act.c b/InfraStack/OSAgnostic/Product/AppSrvInfra/Act.c
index 646ec1c..478ad82 100644
--- a/InfraStack/OSAgnostic/Product/AppSrvInfra/Act.c
+++ b/InfraStack/OSAgnostic/Product/AppSrvInfra/Act.c
@@ -64,8 +64,6 @@ POSSIBILITY OF SUCH DAMAGE.
 static UINT32 agentsInitialized;
 static UINT32 agentsStarted;
 
-static tACTFunctions pACTFunctions[10] = {NULL};
-
 // for L5 layer
 static L5_CONNECTION g_act_Connection = NULL;
 static tL5DispatcherFunctions *g_act_pFuncs = NULL;
@@ -76,12 +74,10 @@ static tUtilityFunctions *g_act_Utils = NULL;
 OSAL_mutex_t act_mutex_ctrl = NULL;	
 
 static wmx_ModeOfOperation_t operationMode = ModeOfOperationNormal; 
-static BOOL act_down = TRUE;
 static BOOL isL5DispatcherOpen = FALSE;
 // because both error reports (internal and ctrl) will restart all entities, we will act only apon the first report
 // (internal problem report won't reset the driver, but if after
 // restarting all appsrv entities we will still have driver problems then we will reset the driver)
-static BOOL error_reported = FALSE;
 
 // The thread that handles the messages ACT receives -
 // We cannot process these messages on the context of the sending thread (because we need to stop the 
@@ -106,7 +102,6 @@ static OSAL_event_t act_event_driverUpEvent = NULL;
 static OSAL_event_t act_event_driverDownEvent = NULL;
 
 static BOOL devicePresent = TRUE;
-static BOOL firstRun = TRUE;
 
 static UINT32	configReason;
 static BOOL		isConfigReasonValid = FALSE;
@@ -117,7 +112,6 @@ DRIVER_STATUS lastReportedIsDriverConnected = DRIVER_DOWN;
 static LONG isDriverInitialized = 0;
 static BOOL useTraces = FALSE;
 static BOOL isActStarted = FALSE;
-static BOOL loadMOCMsgProxy = FALSE;
 static BOOL isRemote = FALSE;
 
 extern struct L4Configurations;
@@ -133,8 +127,6 @@ BOOL UpdateDriverStateToAgents();
 
 // ----------- Instrumentation related changes -----------------
 
-static OSAL_dynlib_t p_inst_lib = NULL;
-
 agent_Initialize pfn_DnDAgent_Initialize;
 agent_Finalize pfn_DnDAgent_Finalize;
 agent_Start pfn_DnDAgent_Start;
@@ -516,7 +508,6 @@ void Act_MessagesHandler(L5_CONNECTION Conn,
 	wmx_Version_t expectedPipeHandlerVersion;
 	VERSION_RESULT versionResult;
 	UINT32 responseBufferSize;
-	UINT32 res;
 	ReportState_type stateReport;
 	wmx_Status_t st;	
 
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.c b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.c
index ee8a16e..4a67582 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.c
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.c
@@ -164,11 +164,6 @@ static BOOL				isOutputEnabled = FALSE;
 
 static char				*sDsimDefault = "C:\\temp\\dSim_Default\\";
 
-static char				g_TraceLoggerDirPathBuf[_MAX_DIR] = {INITIAL_DIR_PATH};
-static UINT32			fileSignatureSDillo = 0;
-static UINT32			fileSignatureNDillo = 0;
-static UINT32			fileSignatureArm0 = 0;
-static UINT32			fileSignatureArm1 = 0;
 
 // file variables
 static FILE				*pTraceLogFile					= NULL;	/* At the first run - open a new log file, overwriting the previous*/
@@ -188,12 +183,6 @@ static char				path_buffer[_MAX_PATH];
 static char				parentDirectory[_MAX_PATH];
 static BOOL				isSetPathInInitRequired = TRUE;
 
-// trace files names
-static char			arm0StringFileName[_MAX_PATH] = "";
-static char			arm1StringFileName[_MAX_PATH] = "";
-static char			NdilloStringFileName[_MAX_PATH] = "";
-static char			SdilloStringFileName[_MAX_PATH] = "";
-
 // L5 connections
 static L5_CONNECTION			nDisTraceConnection = NULL;
 static tL5DispatcherFunctions	*pFuncs;
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.h b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.h
index 84e81e2..a45390f 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.h
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/DnDAgent.h
@@ -67,6 +67,4 @@ void DnDAgent_EventHandler(			L5_CONNECTION Conn,
 									 void *pvEventData,
 									 void *pvUserContext );
 
-static void CreateOverrunBuff(char * buff);
-
-#endif //_DND_AGENT_H_
\ No newline at end of file
+#endif //_DND_AGENT_H_
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/L4DnDHandler.c b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/L4DnDHandler.c
index 3800cae..1249c8a 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/L4DnDHandler.c
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/L4DnDHandler.c
@@ -50,8 +50,6 @@
 //#define L4_DND_HEADER_LENGTH HEADER_SIZE + SIZE_OF_TYPE_LENGTH + BM_L4DnDMonitorHeader_HostTimestamp_BYTES_SIZE
 //static UINT8 monHeader[HEADER_SIZE + SIZE_OF_TYPE_LENGTH + TIMESTAMP_LENGTH];
 static UINT8 monHeader[BM_L4DnDMonitorHeader_BYTES_SIZE];
-static UINT8 traceHeader[BM_L4DnDMonitorHeader_BYTES_SIZE];
-static UINT8 timeStamp[BM_L4DnDMonitorHeader_HostTimestamp_BYTES_SIZE];
 static UINT8 monitorFilterTable[MONITOR_FILTER_TABLE_SIZE];
 static BOOL isMonitorOn = FALSE;
 static BOOL isInitialized = FALSE;
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/MocMsgProxy.c b/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/MocMsgProxy.c
index 46673a3..4f0c8af 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/MocMsgProxy.c
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/MocMsgProxy.c
@@ -51,21 +51,6 @@
 
 static tUtilityFunctions *pUtils;
 
-static void MyPrintf(const char* format, ...)
-{
-//	if (mLogToConsole == 0)
-//	{
-//		return;
-//	}
-
-    va_list args;
-    va_start(args, format);
-    vfprintf(stdout, format, args);
-
-	//TRACE(TR_MOD_MOCMsgProxy, TR_SEV_ERR, (format, args);
-}
-
-
 EXTERN_C EXPORT BOOL MocMsgProxy_Start()
 {
 	TRACE(TR_MOD_MocMsgProxy, TR_SEV_DEBUG, "MocMsgProxy_Start");
@@ -480,32 +465,6 @@ static void MocMsgProxy_ReleaseSocketID(L5_TARGET_ID nOriginID, void *buf, UINT3
 	TRACE(TR_MOD_MocMsgProxy, TR_SEV_INFO, "Released SocketID = %d held by TargetID = %d. ", socketID, nOriginID);
 }
 
-static void MocMsgProxy_ReleaseSocketIDByTarget(L5_TARGET_ID targetID)
-{
-	int i;
-	BOOL success = FALSE;
-	
-	OSAL_enter_critical_section(&perAppInfoGuard);
-	for (i = 0; i < MOC_MSG_PROXY_MAX_APPS; i++)
-	{
-		if (perAppInfo[i].originID == targetID)
-		{
-			perAppInfo[i].isValid = FALSE;
-			perAppInfo[i].originID = 0;
-			//MyPrintf("\nMocMsgProxy - MocMsgProxy_ReleaseSocketIDByTarget - Released SocketID = %d, associated with TargetID = %d. \n", i, targetID);
-			TRACE(TR_MOD_MocMsgProxy, TR_SEV_INFO, "Released SocketID = %d, associated with TargetID = %d. ", i, targetID);
-			success = TRUE;
-			break;
-		}
-	}
-	OSAL_exit_critical_section(&perAppInfoGuard);
-
-	if (!success)
-	{
-		//MyPrintf("\nMocMsgProxy - MocMsgProxy_ReleaseSocketIDByTarget - Failed to find a SocketID matching TargetID = %d. \n", targetID);
-		TRACE(TR_MOD_MocMsgProxy, TR_SEV_INFO, "Released SocketID = Failed to find a SocketID matching TargetID = %d.", targetID);
-	}
-}
 
 static void MocMsgProxy_SendMocResponse(L5_CONNECTION Conn, L5_TARGET_ID nOriginID, void *buf, UINT32 bufSize)
 {
diff --git a/InfraStack/OSAgnostic/Product/PipeHandler/ConnGateKeeper.c b/InfraStack/OSAgnostic/Product/PipeHandler/ConnGateKeeper.c
index 4ca54f8..526db5f 100644
--- a/InfraStack/OSAgnostic/Product/PipeHandler/ConnGateKeeper.c
+++ b/InfraStack/OSAgnostic/Product/PipeHandler/ConnGateKeeper.c
@@ -71,16 +71,12 @@ static OSAL_thread_t gkThread = NULL;	// thread handle
 static OSAL_critical_section lockIsConnected;		// @@@ : JSS : Replaced CRITICAL_SECTION
 static OSAL_critical_section lockConnParams;
 static wmx_CtrlStatus_t isConnected;
-static DRIVER_STATUS driverStatus = DRIVER_DOWN;
 static BOOL isInitialized = FALSE;
 static List *eventsSubsList = NULL;
 static BOOL firstRun = TRUE;
 static BOOL isOverrideConnParams = FALSE;
 static L5_RESULT l5status = L5_RESULT_ALREADY_DISCONNECTED;
-static L5_RESULT returnedL5status = L5_RESULT_ALREADY_DISCONNECTED;
 static BOOL isRestartRequired = FALSE;
-static LONG numOfInits = 0;
-static int clientCount = 0;
 
 // methods declarations
 void PIPE_HANDLER_EventHandler(L5_CONNECTION Conn, L5_EVENT eEvent, void *pvEventData, void *pvUserContext);
diff --git a/InfraStack/OSAgnostic/Product/PipeHandler/L5Connector.c b/InfraStack/OSAgnostic/Product/PipeHandler/L5Connector.c
index 0a43afc..5512489 100644
--- a/InfraStack/OSAgnostic/Product/PipeHandler/L5Connector.c
+++ b/InfraStack/OSAgnostic/Product/PipeHandler/L5Connector.c
@@ -159,8 +159,6 @@ L5_RESULT PIPE_HANDLER_ConnectInternal(
 	UINT32 dwWaitResult;
 	L5_RESULT res;
 
-	char tempIpAddress[32];
-	size_t numOfChars;
 	// Progress variables for initialization
 	BOOL bCreatedCriticalSection = FALSE;
 	BOOL bSocketsInitialized = FALSE;
diff --git a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/L4_db/NDnSAgent_DB_Save.c b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/L4_db/NDnSAgent_DB_Save.c
index 4b39531..a619d30 100644
--- a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/L4_db/NDnSAgent_DB_Save.c
+++ b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/L4_db/NDnSAgent_DB_Save.c
@@ -1065,7 +1065,6 @@ void l4db_AddApdoOperatorConfigurationToXml(pXmlElement parentXmlData, wmx_ApdoO
 	pXmlElement	configurationInternalNode;
 	pXmlElement	nextData;
 	pXmlElement	nextNextData, currentNode;
-	char		buf[BUFF_SIZE];
 	int i=0;
 	UNREFERENCED_PARAMETER(buf);
 	//UNREFERENCED_PARAMETER(configurationNode);
@@ -1492,4 +1491,4 @@ void l4db_AddWmxToXml(pXmlElement parentXmlData, pWimax_t pWimax)
 	// Mac address
 	tempNode = CreateXmlData(L4DB_XML_TOKEN_MAC_ADDRESS, pWimax->radioModules[0].macAddress);
 	AddChild(wmxDynamicNode, tempNode);
-}
\ No newline at end of file
+}
diff --git a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent.c b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent.c
index 94414b8..87321c7 100644
--- a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent.c
+++ b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent.c
@@ -3179,7 +3179,6 @@ wmx_Status_t NDnSAgent_GetLinkStatus( UINT32 *bufferLength, UINT8 *buffer )
 	wmx_Status_t status=WMX_ST_OK;
 	wmx_pUserLinkStatus_t userLinkStatus;
 	//static wmx_LinkStatus_t linkStatus;
-	static BOOL fIsLastTimeWasIdle = FALSE;
 	BOOL fIsCacheState;
 
 	if (*bufferLength < sizeof(wmx_UserLinkStatus_t))
@@ -3236,8 +3235,6 @@ wmx_Status_t NDnSAgent_GetStatistics( UINT32 *bufferLength, UINT8 *buffer )
 	BOOL fIsCacheState;
 	static wmx_Statistics_t Statistics={0};
 
-	static BOOL fIsLastTimeWasIdle = FALSE;
-
 
 	if (*bufferLength < sizeof(wmx_UserStatistics_t))
 	{
@@ -4587,7 +4584,6 @@ wmx_Status_t GetInstallationInfo(void *buffer, UINT32 *bufferSize)
 wmx_Status_t GeneratePseudoNAI (char *pseudoNai, int buffSize){
 
 	BOOL st;
-	static char *lastString;
 
 	if (pseudoNai == NULL || buffSize == 0) {
 		return WMX_ST_FAIL;
diff --git a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_L4P.c b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_L4P.c
index 1ef93fd..fce6d59 100644
--- a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_L4P.c
+++ b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_L4P.c
@@ -663,7 +663,7 @@ wmx_Status_t l4P_RemoveRedundantChannels(wmx_pChannelInfoArr pOriginalArr)
 	uniqueSize = origSize;
 
 
-	for(origSize; origSize < pOriginalArr->arrSize; origSize++)
+	for(; origSize < pOriginalArr->arrSize; origSize++)
 	{
 		foundMatch = FALSE;
 		for(i=0; i < uniqueSize ;i++)
diff --git a/InfraStack/OSAgnostic/WiMax/Wrappers/CommonAPI/wimaxapi.c b/InfraStack/OSAgnostic/WiMax/Wrappers/CommonAPI/wimaxapi.c
index 7a15e27..4e95718 100644
--- a/InfraStack/OSAgnostic/WiMax/Wrappers/CommonAPI/wimaxapi.c
+++ b/InfraStack/OSAgnostic/WiMax/Wrappers/CommonAPI/wimaxapi.c
@@ -75,7 +75,6 @@ static LONG isDeviceOpen = FALSE;
 OSAL_critical_section cs;
 static WIMAX_API_DEVICE_ID DeviceID = {0};
 static LONG isReady = FALSE;
-static UINT8 systemStateCBRefCount = 0;
 static IndDeviceInsertRemove ctrlStatusCB = NULL;
 static IndPermissionsUpdate permissionsUpdateCB = NULL;
 static IndControlPowerManagement powerStateCB = NULL;
@@ -102,7 +101,6 @@ static WIMAX_API_RF_STATE rfState = WIMAX_API_RF_OFF;
 static BOOL isConnected = FALSE;
 static WIMAX_API_NSP_INFO_EX nspsEx[WMX_NSPS_MAX_NUM];
 static UINT32 numberOfNSPs = 0;
-static HANDLE namedEvent;
 static OSAL_event_t hijackedEvent;
 static BOOL exitLoop = TRUE;
 static OSAL_event_t releasedEvent;
@@ -1269,7 +1267,6 @@ void CheckNamedEvent(void *dummy)
 {
 	//	UINT32 waitRes;
 	int resNamed = 999;
-	static int lastResult = 0;
 	UNREFERENCED_PARAMETER(dummy);
 
 
diff --git a/InfraStack/OSAgnostic/WiMax/Wrappers/NDnS/wmxSDK_Nds_IndHandler.c b/InfraStack/OSAgnostic/WiMax/Wrappers/NDnS/wmxSDK_Nds_IndHandler.c
index 1bd3407..096cd14 100644
--- a/InfraStack/OSAgnostic/WiMax/Wrappers/NDnS/wmxSDK_Nds_IndHandler.c
+++ b/InfraStack/OSAgnostic/WiMax/Wrappers/NDnS/wmxSDK_Nds_IndHandler.c
@@ -45,8 +45,6 @@
 #include "wimax_osal_ip_services.h"
 #include "TraceModule.h"
 
-static OSAL_thread_t IPRenewThread = NULL;
-
 void wmxNds_CBsCaller( UINT32 internalRequestID, void *buffer, UINT32 bufferLength )
 {
 	wmx_pSystemStateUpdate pSystemStateUpdate;
diff --git a/InfraStack/OSDependent/Linux/InfraStackModules/IPCs/DnDServerSocket.c b/InfraStack/OSDependent/Linux/InfraStackModules/IPCs/DnDServerSocket.c
index ec1ed5b..a67bb90 100644
--- a/InfraStack/OSDependent/Linux/InfraStackModules/IPCs/DnDServerSocket.c
+++ b/InfraStack/OSDependent/Linux/InfraStackModules/IPCs/DnDServerSocket.c
@@ -396,7 +396,6 @@ int DND_SERVER_SOCKETS_SendToClient(char *buf, int len, int socket_id)
 	int res = 0;
 	//#define MAX_DATA_SIZE 8232
 #define STATUS_INTEL_80216_CUSTOM	( 0x20000000 )	// Custom status has "1" on 29h bit
-	char retMsg[MAX_DATA_SIZE];
 	//int bytesSent;
 
 
diff --git a/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapi.c b/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapi.c
index 4ea70fc..27c8abc 100644
--- a/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapi.c
+++ b/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapi.c
@@ -882,7 +882,6 @@ static int init_device()
 
 static int preinit_device()
 {
-	UINT32 BytesWritten = 0;
 	// Request Fields
 	UINT8 *requestBuffer;
 	UINT32 requestBufferSize;
@@ -890,7 +889,6 @@ static int preinit_device()
 	struct i2400m_l3l4_hdr *ack;
 
 	// Response Fields
-	UINT32 responseID;
 	UINT8 *responseBuffer;
 	UINT32 responseBufferSize;
 	char *OpcodeName;
diff --git a/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapiForSim.c b/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapiForSim.c
index 6ba5fe7..652a6d5 100644
--- a/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapiForSim.c
+++ b/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapiForSim.c
@@ -40,28 +40,6 @@
 #include "L4MsgProxy.h"
 
 
-static SOCKETS_CLIENT_CONTEXT oidClient;
-static SOCKETS_CLIENT_ID oidClientID;
-
-static SOCKETS_CLIENT_CONTEXT indClient;
-static SOCKETS_CLIENT_ID indClientID;
-
-static char g_host[100]; // TODO
-static unsigned short g_oidsPort;
-static unsigned short g_indsPort;
-
-//static HANDLE kdapiForSim_mutex = NULL;
-static OSAL_critical_section kdapiforsimLock;
-
-static int oidResponseResult;
-static char* oidResponseBuffer;
-static int oidResponseSize;
-
-static OSAL_event_t g_hReceivedOidResponseEvent = NULL;
-static OSAL_event_t g_hStopWaitingForOidResponseEvent = NULL;
-
-static KDAPI_FOR_SIM_IndicationHandler indsFunc;
-
 // set the oidResponseBuffer and the oidResponseSize
 // and raise the receivedOidResponseEvent
 void HandleOids( char* buffer, int size, SOCKETS_CLIENT_ID client, void* context )
diff --git a/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericDaemon.c b/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericDaemon.c
index 85fd7e4..bdf6e22 100644
--- a/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericDaemon.c
+++ b/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericDaemon.c
@@ -55,7 +55,6 @@ OSAL_event_t deviceInsertRemoveEvent;
 OSAL_critical_section csDeviceInsertRemove;
 
 static sem_t dsem;
-static char gcLogFilePathName[MAX_FILENAME_LEN];
 
 int IsDaemonRunning()
 {
diff --git a/InfraStack/OSDependent/Linux/InfraStackModules/TraceModule/TraceModule.c b/InfraStack/OSDependent/Linux/InfraStackModules/TraceModule/TraceModule.c
index 42af5d1..1756f6d 100644
--- a/InfraStack/OSDependent/Linux/InfraStackModules/TraceModule/TraceModule.c
+++ b/InfraStack/OSDependent/Linux/InfraStackModules/TraceModule/TraceModule.c
@@ -263,7 +263,6 @@ void Trace_CloseLogFile()
 BOOL Trace_OpenLogFile()
 {
 	char fileName[MAX_PATH];
-	int lastLogFileIndex;
 //	struct stat fileStat;
 
 	OSAL_snprintf(fileName, MAX_FILENAME_LEN, "%s/%s%s", gcLogFilePathName,