Skip to content

Commit 6381e9b

Browse files
authored
avoid reserved keyword operator in ACTA_ReserveTransfer (#571)
1 parent 8ca109d commit 6381e9b

File tree

2 files changed

+5
-5
lines changed
  • libctru

2 files changed

+5
-5
lines changed

libctru/include/3ds/services/act.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -917,11 +917,11 @@ Result ACTA_SetIsMiiUpdated(u8 accountSlot, bool isDirty);
917917
* @brief Initializes a server account transfer of a specific account to another device.
918918
* @param accountSlot The account slot number of the account to transfer the server account of.
919919
* @param newDevice Pointer to device info of the target device.
920-
* @param operator Pointer to operator data for the transfer.
920+
* @param operatorData Pointer to operator data for the transfer.
921921
* @param operatorSize Size of the operator data buffer (max: 0x100)
922922
* @param completionEvent The event handle to signal once the request has finished.
923923
*/
924-
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operator, u32 operatorSize, Handle completionEvent);
924+
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operatorData, u32 operatorSize, Handle completionEvent);
925925

926926
/**
927927
* @brief Finalizes a server account transfer of a specifc account to another device.
@@ -993,4 +993,4 @@ Result ACTA_ReloadAndBlockSaveData(Handle unloadFinishedEvent, Handle remountAnd
993993
* @param accountSlot The account slot number of the account to perform this action on.
994994
* @param completionEvent The event handle to signal once the request has finished.
995995
*/
996-
Result ACTA_ReserveServerAccountDeletion(u8 accountSlot, Handle completionEvent);
996+
Result ACTA_ReserveServerAccountDeletion(u8 accountSlot, Handle completionEvent);

libctru/source/services/act.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ Result ACTA_SetIsMiiUpdated(u8 accountSlot, bool isDirty)
12181218
return (Result)cmdbuf[1];
12191219
}
12201220

1221-
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operator, u32 operatorSize, Handle completionEvent)
1221+
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operatorData, u32 operatorSize, Handle completionEvent)
12221222
{
12231223
Result ret = 0;
12241224
u32 *cmdbuf = getThreadCommandBuffer();
@@ -1230,7 +1230,7 @@ Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operato
12301230
cmdbuf[8] = IPC_Desc_SharedHandles(1);
12311231
cmdbuf[9] = completionEvent;
12321232
cmdbuf[10] = IPC_Desc_Buffer(operatorSize, IPC_BUFFER_R);
1233-
cmdbuf[11] = (u32)operator;
1233+
cmdbuf[11] = (u32)operatorData;
12341234

12351235
if (R_FAILED(ret = svcSendSyncRequest(actHandle))) return ret;
12361236

0 commit comments

Comments
 (0)