Index: cifxapi.c
===================================================================
--- cifxapi.c	(revision 5813)
+++ cifxapi.c	(working copy)
@@ -437,14 +437,12 @@
   }
   if(ulSize >= sizeof(ptDriverInfo))
   {
-    OS_Strvsprintf( ptDriverInfo->abDriverVersion, 32,
-                  "%s, V%d.%d.%d.%d",
-                  "cifXAPI-netXTransport",
-                  CIFX_DRV_VERSION_MAJOR,
-                  CIFX_DRV_VERSION_MINOR,
-                  CIFX_DRV_VERSION_REV,
-                  CIFX_DRV_VERSION_BUILD);
+    #define STR_EXPAND(tok) #tok
+    #define STR(tok) STR_EXPAND(tok)
 
+    const char abVer[] = "cifXAPI-netXTransport, V"STR(CIFX_DRV_VERSION_MAJOR)"."STR(CIFX_DRV_VERSION_MINOR)"."STR(CIFX_DRV_VERSION_REV)"."STR(CIFX_DRV_VERSION_BUILD);
+    OS_Strncpy(ptDriverInfo->abDriverVersion, 32, abVer, OS_Strlen(abVer));
+
     ptDriverInfo->ulBoardCnt = 0;
     for (ulSupportedTLCount = 0; ulSupportedTLCount<(g_ptCifXDrvInfo->ulTLInfoSize/sizeof(DRV_TL_INFO_T));ulSupportedTLCount++)
     {
Index: netXTransport.c
===================================================================
--- netXTransport.c	(revision 5813)
+++ netXTransport.c	(working copy)
@@ -1315,10 +1315,11 @@
 void DeviceNotifyCallback( const char* szInterfaceName, const char* szDeviceName, uint32_t ulDeviceIdentifier, NETX_INTERFACE_NOTIFICATION_E eNotify, void* hTransport, void* pvDevicePrivateData)
 {
   PNETX_TRANSPORT_INTERFACE_T ptInterface = netXTransportSearchInterface( szInterfaceName);
-  char                        szNewDeviceName[NXT_MAX_PATH];
+  char                        szNewDeviceName[NXT_MAX_PATH] = "";
 
-  OS_Strvsprintf( szNewDeviceName, 16, "%s_%s", szInterfaceName, szDeviceName);
-
+  OS_Strcat(szNewDeviceName, NXT_MAX_PATH, (char*)szInterfaceName);
+  OS_Strcat(szNewDeviceName, NXT_MAX_PATH, "_");
+  OS_Strcat(szNewDeviceName, NXT_MAX_PATH, (char*)szDeviceName);
   netXTransportDeviceStateChange( ptInterface, NULL, szNewDeviceName, ulDeviceIdentifier, eNotify, hTransport, pvDevicePrivateData);
 }
 
Index: OS_Dependent.h
===================================================================
--- OS_Dependent.h	(revision 5813)
+++ OS_Dependent.h	(working copy)
@@ -75,7 +75,6 @@
 int      OS_Strnicmp(const char* pszBuf1, const char* pszBuf2, uint32_t ulLen);
 int      OS_Strlen(const char* szText);
 char*    OS_Strncpy(char* szDest, uint32_t ulDstSize, const char* szSource, uint32_t ulLen);
-char*    OS_Strvsprintf(char *szDest, uint32_t ulSize, const char *format, ...);
 uint32_t OS_Strcspn( char* szSearchStr, char* szFindStr);
 char*    OS_Strcat(char* szDest, uint32_t ulDstSize, char* szSrc);