fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some xb style cleanup.

Browse Source
This commit is contained in:
Ben Vanik
2015-08-05 22:06:20 -07:00
parent eaa1a8ee3a
commit e6461f326c
29 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/kernel/content_manager.cc
View File

@@ -81,7 +81,7 @@ std::wstring ContentManager::ResolvePackageRoot(uint32_t content_type) {
// content_root/title_id/type_name/
auto package_root =
xe::join_paths(root_path_, xe::join_paths(title_id, type_name));
return package_root + xe::wpath_separator;
return package_root + xe::kWPathSeparator;
}
std::wstring ContentManager::ResolvePackagePath(const XCONTENT_DATA& data) {
@@ -90,7 +90,7 @@ std::wstring ContentManager::ResolvePackagePath(const XCONTENT_DATA& data) {
auto package_root = ResolvePackageRoot(data.content_type);
auto package_path =
xe::join_paths(package_root, xe::to_wstring(data.file_name));
package_path += xe::path_separator;
package_path += xe::kPathSeparator;
return package_path;
}

8
src/xenia/kernel/xam_net.cc
View File

@@ -593,9 +593,11 @@ SHIM_CALL NetDll_select_shim(PPCContext* ppc_context,
timeval* timeout_in = nullptr;
timeval timeout;
if (timeout_ptr) {
timeout = {static_cast<long>(SHIM_MEM_32(timeout_ptr + 0)),
static_cast<long>(SHIM_MEM_32(timeout_ptr + 4))};
Clock::ScaleGuestDurationTimeval(&timeout.tv_sec, &timeout.tv_usec);
timeout = {static_cast<int32_t>(SHIM_MEM_32(timeout_ptr + 0)),
static_cast<int32_t>(SHIM_MEM_32(timeout_ptr + 4))};
Clock::ScaleGuestDurationTimeval(
reinterpret_cast<int32_t*>(&timeout.tv_sec),
reinterpret_cast<int32_t*>(&timeout.tv_usec));
timeout_in = &timeout;
}
int ret = select(nfds, readfds_ptr ? &readfds : nullptr,