Skip to content

avoid reserved keyword operator in ACTA_ReserveTransfer #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TuxSH merged 1 commit into from
May 9, 2025
Merged

avoid reserved keyword operator in ACTA_ReserveTransfer #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libctru/include/3ds/services/act.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,11 +917,11 @@ Result ACTA_SetIsMiiUpdated(u8 accountSlot, bool isDirty);
* @brief Initializes a server account transfer of a specific account to another device.
* @param accountSlot The account slot number of the account to transfer the server account of.
* @param newDevice Pointer to device info of the target device.
* @param operator Pointer to operator data for the transfer.
* @param operatorData Pointer to operator data for the transfer.
* @param operatorSize Size of the operator data buffer (max: 0x100)
* @param completionEvent The event handle to signal once the request has finished.
*/
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operator, u32 operatorSize, Handle completionEvent);
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operatorData, u32 operatorSize, Handle completionEvent);

/**
* @brief Finalizes a server account transfer of a specifc account to another device.
Expand Down Expand Up @@ -993,4 +993,4 @@ Result ACTA_ReloadAndBlockSaveData(Handle unloadFinishedEvent, Handle remountAnd
* @param accountSlot The account slot number of the account to perform this action on.
* @param completionEvent The event handle to signal once the request has finished.
*/
Result ACTA_ReserveServerAccountDeletion(u8 accountSlot, Handle completionEvent);
Result ACTA_ReserveServerAccountDeletion(u8 accountSlot, Handle completionEvent);
4 changes: 2 additions & 2 deletions libctru/source/services/act.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ Result ACTA_SetIsMiiUpdated(u8 accountSlot, bool isDirty)
return (Result)cmdbuf[1];
}

Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operator, u32 operatorSize, Handle completionEvent)
Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operatorData, u32 operatorSize, Handle completionEvent)
{
Result ret = 0;
u32 *cmdbuf = getThreadCommandBuffer();
Expand All @@ -1230,7 +1230,7 @@ Result ACTA_ReserveTransfer(u8 accountSlot, DeviceInfo *newDevice, char *operato
cmdbuf[8] = IPC_Desc_SharedHandles(1);
cmdbuf[9] = completionEvent;
cmdbuf[10] = IPC_Desc_Buffer(operatorSize, IPC_BUFFER_R);
cmdbuf[11] = (u32)operator;
cmdbuf[11] = (u32)operatorData;

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

Expand Down