CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: Utilize std::array within PopLaunchParameter() 

Gets rid of the potential for C array-to-pointer decay, and also makes
pointer arithmetic to get the end of the copy range unnecessary. We can
just use std::array's begin() and end() member functions.
This commit is contained in:
Lioncash 2018-08-21 10:59:37 -04:00
parent c95c4442e9
commit 8dd9cb98ce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/hle/service/am/am.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <array>
#include <cinttypes> #include <cinttypes>
#include <stack> #include <stack>
#include "core/core.h" #include "core/core.h"
@ -625,16 +626,16 @@ IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationF
} }
void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
constexpr u8 data[0x88] = { constexpr std::array<u8, 0x88> data{{
0xca, 0x97, 0x94, 0xc7, // Magic 0xca, 0x97, 0x94, 0xc7, // Magic
1, 0, 0, 0, // IsAccountSelected (bool) 1, 0, 0, 0, // IsAccountSelected (bool)
1, 0, 0, 0, // User Id (word 0) 1, 0, 0, 0, // User Id (word 0)
0, 0, 0, 0, // User Id (word 1) 0, 0, 0, 0, // User Id (word 1)
0, 0, 0, 0, // User Id (word 2) 0, 0, 0, 0, // User Id (word 2)
0, 0, 0, 0 // User Id (word 3) 0, 0, 0, 0 // User Id (word 3)
}; }};
std::vector<u8> buffer(data, data + sizeof(data)); std::vector<u8> buffer(data.begin(), data.end());
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};