summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-01 21:35:49 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-01 22:40:36 +0300
commitfc854786ed73fe768d6a3ca22c02f7013560a930 (patch)
tree3a12f555d194679957559760567ff8eb701b494b /src/utils
parent09d74d9273cca445b7019edacaff53452a1eee3c (diff)
downloadmanaplus-fc854786ed73fe768d6a3ca22c02f7013560a930.tar.gz
manaplus-fc854786ed73fe768d6a3ca22c02f7013560a930.tar.bz2
manaplus-fc854786ed73fe768d6a3ca22c02f7013560a930.tar.xz
manaplus-fc854786ed73fe768d6a3ca22c02f7013560a930.zip
Fix code style.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/mkdir.cpp3
-rw-r--r--src/utils/process.cpp7
-rw-r--r--src/utils/sha256.cpp2
3 files changed, 8 insertions, 4 deletions
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index 4632bec84..f73af6db5 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -54,6 +54,9 @@ int mkdir_r(const char *pathname)
int len = static_cast<int>(strlen(tmp));
+ if (len < 1)
+ return -1;
+
// terminate the pathname with '/'
if (tmp[len - 1] != '/')
{
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index b02874b0d..3a742b313 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -86,9 +86,10 @@ bool execFile(std::string pathName, std::string name A_UNUSED,
if (!arg2.empty())
args += " " + arg2;
- bool res = CreateProcess(pathName.c_str(), (char*)args.c_str(), nullptr,
- nullptr, false, CREATE_DEFAULT_ERROR_MODE, nullptr, nullptr,
- &siStartupInfo, &piProcessInfo);
+ bool res = CreateProcess(pathName.c_str(), const_cast<char*>(
+ args.c_str()), nullptr, nullptr, false,
+ CREATE_DEFAULT_ERROR_MODE, nullptr, nullptr, &siStartupInfo,
+ &piProcessInfo);
CloseHandle(piProcessInfo.hProcess);
CloseHandle(piProcessInfo.hThread);
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 21ded486b..a56f6ec9a 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -279,7 +279,7 @@ std::string SHA256Hash(const char *src, int len)
unsigned char bytehash[SHA256_DIGEST_SIZE];
SHA256Context ctx;
SHA256Init(&ctx);
- SHA256Update(&ctx, (unsigned char *)(src),
+ SHA256Update(&ctx, static_cast<unsigned char *>(src),
static_cast<unsigned int>(len));
SHA256Final(&ctx, bytehash);
// Convert it to hex