Replace POSIX function names with ISO C++ conformant underscore-prepended names (strupr, strlwr, stricmp, strcmpi, unlink, itoa).

Author: tamlin-mike

src/Layers/xrRender/Blender_Recorder_R2.cpp

@@ -40,7 +40,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest, BO
     ctable.merge(&vs->constants);
 
     // Last Stage - disable
-    if (0 == stricmp(_ps, "null"))
+    if (0 == _stricmp(_ps, "null"))
     {
         RS.SetTSS(0, D3DTSS_COLOROP, D3DTOP_DISABLE);
         RS.SetTSS(0, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

src/Layers/xrRender/FHierrarhyVisual.cpp

@@ -71,7 +71,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags)
                     xr_strcpy(short_name, N);
                     if (strext(short_name))
                         *strext(short_name) = 0;
-                    strconcat(sizeof(name_load), name_load, short_name, ":", itoa(count, num, 10));
+                    strconcat(sizeof(name_load), name_load, short_name, ":", _itoa(count, num, 10));
                     children.push_back((dxRender_Visual*)GlobalEnv.Render->model_CreateChild(name_load, O));
                     O->close();
                     O = OBJ->open_chunk(count);

src/Layers/xrRender/HW.cpp

@@ -590,7 +590,7 @@ struct _uniq_mode
 {
     _uniq_mode(LPCSTR v) : _val(v) {}
     LPCSTR _val;
-    bool operator()(LPCSTR _other) { return !stricmp(_val, _other); }
+    bool operator()(LPCSTR _other) { return !_stricmp(_val, _other); }
 };
 
 #ifndef _EDITOR

src/Layers/xrRender/ModelPool.cpp

@@ -220,7 +220,7 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data)
     string_path low_name;
     VERIFY(xr_strlen(name) < sizeof(low_name));
     xr_strcpy(low_name, name);
-    strlwr(low_name);
+    _strlwr(low_name);
     if (strext(low_name))
         *strext(low_name) = 0;
     //	Msg						("-CREATE %s",low_name);
@@ -266,7 +266,7 @@ dxRender_Visual* CModelPool::CreateChild(LPCSTR name, IReader* data)
     string256 low_name;
     VERIFY(xr_strlen(name) < 256);
     xr_strcpy(low_name, name);
-    strlwr(low_name);
+    _strlwr(low_name);
     if (strext(low_name))
         *strext(low_name) = 0;
 

src/Layers/xrRender/PSLibrary.cpp

@@ -155,7 +155,7 @@ bool CPSLibrary::Load2()
 #endif
 
         xr_sprintf(_path, sizeof(_path), "%s%s", p_path, p_name);
-        if (0 == stricmp(p_ext, ".pe"))
+        if (0 == _stricmp(p_ext, ".pe"))
         {
             PS::CPEDef* def = new PS::CPEDef();
             def->m_Name = _path;
@@ -164,7 +164,7 @@ bool CPSLibrary::Load2()
             else
                 xr_delete(def);
         }
-        else if (0 == stricmp(p_ext, ".pg"))
+        else if (0 == _stricmp(p_ext, ".pg"))
         {
             PS::CPGDef* def = new PS::CPGDef();
             def->m_Name = _path;

src/Layers/xrRender/ResourceManager.cpp

@@ -21,11 +21,11 @@ void fix_texture_name(LPSTR fn);
 void fix_texture_name(LPSTR fn)
 {
     LPSTR _ext = strext(fn);
-    if(  _ext					&&
-      (0==stricmp(_ext,".tga")	||
-        0==stricmp(_ext,".dds")	||
-        0==stricmp(_ext,".bmp")	||
-        0==stricmp(_ext,".ogm")	) )
+    if (_ext &&
+        (0==_stricmp(_ext, ".tga") ||
+        0==_stricmp(_ext, ".dds") ||
+        0==_stricmp(_ext, ".bmp") ||
+        0==_stricmp(_ext, ".ogm")))
         *_ext = 0;
 }
 */
@@ -120,7 +120,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names)
         {
             // flush
             N.push_back(0);
-            strlwr(N.begin());
+            _strlwr(N.begin());
 
             fix_texture_name(N.begin());
             //. andy			if (strext(N.begin())) *strext(N.begin())=0;
@@ -137,7 +137,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names)
     {
         // flush
         N.push_back(0);
-        strlwr(N.begin());
+        _strlwr(N.begin());
 
         fix_texture_name(N.begin());
         //. andy		if (strext(N.begin())) *strext(N.begin())=0;

src/Layers/xrRender/ResourceManager_Resources.cpp

@@ -180,7 +180,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         SVS* _vs = new SVS();
         _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         m_vs.insert(std::make_pair(_vs->set_name(name), _vs));
-        if (0 == stricmp(_name, "null"))
+        if (0 == _stricmp(_name, "null"))
         {
             _vs->vs = NULL;
             return _vs;
@@ -266,7 +266,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
         SPS* _ps = new SPS();
         _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         m_ps.insert(std::make_pair(_ps->set_name(name), _ps));
-        if (0 == stricmp(name, "null"))
+        if (0 == _stricmp(name, "null"))
         {
             _ps->ps = NULL;
             return _ps;
@@ -558,7 +558,7 @@ void CResourceManager::DBG_VerifyTextures()
 CMatrix* CResourceManager::_CreateMatrix(LPCSTR Name)
 {
     R_ASSERT(Name && Name[0]);
-    if (0 == stricmp(Name, "$null"))
+    if (0 == _stricmp(Name, "$null"))
         return NULL;
 
     LPSTR N = LPSTR(Name);
@@ -596,7 +596,7 @@ void CResourceManager::ED_UpdateMatrix(LPCSTR Name, CMatrix* data)
 CConstant* CResourceManager::_CreateConstant(LPCSTR Name)
 {
     R_ASSERT(Name && Name[0]);
-    if (0 == stricmp(Name, "$null"))
+    if (0 == _stricmp(Name, "$null"))
         return NULL;
 
     LPSTR N = LPSTR(Name);
@@ -784,7 +784,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         SVS* _vs = new SVS();
         _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         m_vs.insert(mk_pair(_vs->set_name(name), _vs));
-        if (0 == stricmp(_name, "null"))
+        if (0 == _stricmp(_name, "null"))
         {
             _vs->vs = NULL;
             return _vs;
@@ -906,7 +906,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
         SPS* _ps = new SPS();
         _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         m_ps.insert(mk_pair(_ps->set_name(name), _ps));
-        if (0 == stricmp(name, "null"))
+        if (0 == _stricmp(name, "null"))
         {
             _ps->ps = NULL;
             return _ps;

src/Layers/xrRender/SH_Texture.cpp

@@ -158,7 +158,7 @@ void CTexture::Load()
 
     flags.bUser = false;
     flags.MemoryUsage = 0;
-    if (0 == stricmp(*cName, "$null"))
+    if (0 == _stricmp(*cName, "$null"))
         return;
     if (0 != strstr(*cName, "$user$"))
     {
@@ -245,7 +245,7 @@ void CTexture::Load()
 
             flags.seqCycles = FALSE;
             _fs->r_string(buffer, sizeof(buffer));
-            if (0 == stricmp(buffer, "cycled"))
+            if (0 == _stricmp(buffer, "cycled"))
             {
                 flags.seqCycles = TRUE;
                 _fs->r_string(buffer, sizeof(buffer));

src/Layers/xrRender/ShaderResourceTraits.h

@@ -94,7 +94,7 @@ inline T* CResourceManager::CreateShader(const char* name)
 
         sh->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         sh_map.insert(std::make_pair(sh->set_name(name), sh));
-        if (0 == stricmp(name, "null"))
+        if (0 == _stricmp(name, "null"))
         {
             sh->sh = NULL;
             return sh;

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -175,7 +175,7 @@ u16 CKinematicsAnimated::LL_PartID(LPCSTR B)
         CPartDef& P = (*m_Partition)[id];
         if (0 == P.Name)
             continue;
-        if (0 == stricmp(B, *P.Name))
+        if (0 == _stricmp(B, *P.Name))
             return id;
     }
     return BI_NONE;