From 4793e5c4ae3472b1f931ec48f913614710a6d12c Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 11 Nov 2018 16:09:24 -0800
Subject: Use C++ for GetProcBinary
---
Alc/alconfig.cpp | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
(limited to 'Alc/alconfig.cpp')
diff --git a/Alc/alconfig.cpp b/Alc/alconfig.cpp
index 29593205..fedb6703 100644
--- a/Alc/alconfig.cpp
+++ b/Alc/alconfig.cpp
@@ -299,13 +299,12 @@ void ReadALConfig(void)
LoadConfigFromFile(f);
}
- al_string ppath = AL_STRING_INIT_STATIC();
- GetProcBinary(&ppath, nullptr);
- if(!alstr_empty(ppath))
+ PathNamePair ppath = GetProcBinary();
+ if(!ppath.path.empty())
{
- alstr_append_cstr(&ppath, "\\alsoft.ini");
- TRACE("Loading config %s...\n", alstr_get_cstr(ppath));
- al::ifstream f{alstr_get_cstr(ppath)};
+ ppath.path += "\\alsoft.ini";
+ TRACE("Loading config %s...\n", ppath.path.c_str());
+ al::ifstream f{ppath.path.c_str()};
if(f.is_open())
LoadConfigFromFile(f);
}
@@ -320,8 +319,6 @@ void ReadALConfig(void)
if(f.is_open())
LoadConfigFromFile(f);
}
-
- alstr_reset(&ppath);
}
#else
void ReadALConfig(void)
@@ -425,15 +422,14 @@ void ReadALConfig(void)
LoadConfigFromFile(f);
}
- al_string ppath = AL_STRING_INIT_STATIC();
- GetProcBinary(&ppath, nullptr);
- if(!alstr_empty(ppath))
+ PathNamePair ppath = GetProcBinary();
+ if(!ppath.path.empty())
{
- if(VECTOR_BACK(ppath) != '/') alstr_append_cstr(&ppath, "/alsoft.conf");
- else alstr_append_cstr(&ppath, "alsoft.conf");
+ if(ppath.path.back() != '/') ppath.path += "/alsoft.conf";
+ else ppath.path += "alsoft.conf";
- TRACE("Loading config %s...\n", alstr_get_cstr(ppath));
- al::ifstream f{alstr_get_cstr(ppath)};
+ TRACE("Loading config %s...\n", ppath.path.c_str());
+ al::ifstream f{ppath.path};
if(f.is_open())
LoadConfigFromFile(f);
}
@@ -445,8 +441,6 @@ void ReadALConfig(void)
if(f.is_open())
LoadConfigFromFile(f);
}
-
- alstr_reset(&ppath);
}
#endif
--
cgit v1.2.3