From c1524e86d65bc5a9ba4af957febf7f16db40d15d Mon Sep 17 00:00:00 2001
From: fincs <fincs@devkitpro.org>
Date: Mon, 21 Oct 2019 21:46:28 +0200
Subject: [PATCH] Update for latest libnx changes

---
 account/source/main.c              |  2 +-
 applet/app-playstats/source/main.c |  6 +++---
 fs/save/source/main.c              | 26 ++++++++------------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/account/source/main.c b/account/source/main.c
index ececcd8..73d264d 100644
--- a/account/source/main.c
+++ b/account/source/main.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
         if (R_SUCCEEDED(rc)) {
             printf("Current userID: 0x%lx 0x%lx\n", userID.uid[1], userID.uid[0]);
 
-            rc = accountGetProfile(&profile, &userID);
+            rc = accountGetProfile(&profile, userID);
 
             if (R_FAILED(rc)) {
                 printf("accountGetProfile() failed: 0x%x\n", rc);
diff --git a/applet/app-playstats/source/main.c b/applet/app-playstats/source/main.c
index a5b19fa..d3eee50 100644
--- a/applet/app-playstats/source/main.c
+++ b/applet/app-playstats/source/main.c
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
             if (R_SUCCEEDED(rc)) {
                 rc = appletQueryApplicationPlayStatistics(stats, titleIDs, sizeof(titleIDs)/sizeof(u64), &total_out);
                 printf("appletQueryApplicationPlayStatistics(): 0x%x\n", rc);
-                //rc = appletQueryApplicationPlayStatisticsByUid(&preselected_uid, stats, titleIDs, sizeof(titleIDs)/sizeof(u64), &total_out);
+                //rc = appletQueryApplicationPlayStatisticsByUid(preselected_uid, stats, titleIDs, sizeof(titleIDs)/sizeof(u64), &total_out);
                 //printf("appletQueryApplicationPlayStatisticsByUid(): 0x%x\n", rc);
             }
             if (R_SUCCEEDED(rc)) {
@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
             if (R_SUCCEEDED(rc)) printf("titleID = 0x%08lX, playtimeMinutes = %u, totalLaunches = %u\n", playstats[0].titleID, playstats[0].playtimeMinutes, playstats[0].totalLaunches);
 
             // Get PdmPlayStatistics for the specified title and user.
-            rc = pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(titleIDs[0], &preselected_uid, &playstats[0]);
+            rc = pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(titleIDs[0], preselected_uid, &playstats[0]);
             printf("pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(): 0x%x\n", rc);
             if (R_SUCCEEDED(rc)) printf("titleID = 0x%08lX, playtimeMinutes = %u, totalLaunches = %u\n", playstats[0].titleID, playstats[0].playtimeMinutes, playstats[0].totalLaunches);
 
@@ -127,7 +127,7 @@ int main(int argc, char* argv[])
             printf("pdmqryGetAvailablePlayEventRange(): 0x%x, 0x%x, 0x%x, 0x%x\n", rc, total_entries, start_entryindex, end_entryindex);
 
             // Get a listing of titles recently played by the specified user.
-            rc = pdmqryQueryRecentlyPlayedApplication(&preselected_uid, titleIDs, 1, &total_out);
+            rc = pdmqryQueryRecentlyPlayedApplication(preselected_uid, titleIDs, 1, &total_out);
             printf("pdmqryQueryRecentlyPlayedApplication(): 0x%x, %d\n", rc, total_out);
             if (R_SUCCEEDED(rc)) {
                 for (i=0; i<total_out; i++)
diff --git a/fs/save/source/main.c b/fs/save/source/main.c
index 627c4e5..391fe76 100644
--- a/fs/save/source/main.c
+++ b/fs/save/source/main.c
@@ -9,19 +9,19 @@
 Result get_save(u64 *titleID, AccountUid *userID)
 {
     Result rc=0;
-    FsSaveDataIterator iterator;
+    FsSaveDataInfoReader reader;
     size_t total_entries=0;
     FsSaveDataInfo info;
 
-    rc = fsOpenSaveDataIterator(&iterator, FsSaveDataSpaceId_NandUser);//See libnx fs.h.
+    rc = fsOpenSaveDataInfoReader(&reader, FsSaveDataSpaceId_NandUser);//See libnx fs.h.
     if (R_FAILED(rc)) {
-        printf("fsOpenSaveDataIterator() failed: 0x%x\n", rc);
+        printf("fsOpenSaveDataInfoReader() failed: 0x%x\n", rc);
         return rc;
     }
 
     //Find the first savedata with FsSaveDataType_SaveData.
     while(1) {
-        rc = fsSaveDataIteratorRead(&iterator, &info, 1, &total_entries);//See libnx fs.h.
+        rc = fsSaveDataInfoReaderRead(&reader, &info, 1, &total_entries);//See libnx fs.h.
         if (R_FAILED(rc) || total_entries==0) break;
 
         if (info.saveDataType == FsSaveDataType_SaveData) {//Filter by FsSaveDataType_SaveData, however note that NandUser can have non-FsSaveDataType_SaveData.
@@ -31,7 +31,7 @@ Result get_save(u64 *titleID, AccountUid *userID)
         }
     }
 
-    fsSaveDataIteratorClose(&iterator);
+    fsSaveDataInfoReaderClose(&reader);
 
     if (R_SUCCEEDED(rc)) return MAKERESULT(Module_Libnx, LibnxError_NotFound);
 
@@ -41,12 +41,10 @@ Result get_save(u64 *titleID, AccountUid *userID)
 int main(int argc, char **argv)
 {
     Result rc=0;
-    int ret=0;
 
     DIR* dir;
     struct dirent* ent;
 
-    FsFileSystem tmpfs;
     AccountUid userID={0};
     u64 titleID=0x01007ef00011e000;//titleID of the save to mount, in this case BOTW.
 
@@ -77,19 +75,11 @@ int main(int argc, char **argv)
         printf("Using titleID=0x%016lx userID: 0x%lx 0x%lx\n", titleID, userID.uid[1], userID.uid[0]);
     }
 
-    if (R_SUCCEEDED(rc)) {
-        rc = fsMount_SaveData(&tmpfs, titleID, &userID);//See also libnx fs.h.
-        if (R_FAILED(rc)) {
-            printf("fsMount_SaveData() failed: 0x%x\n", rc);
-        }
-    }
-
     //You can use any device-name. If you want multiple saves mounted at the same time, you must use different device-names for each one.
     if (R_SUCCEEDED(rc)) {
-        ret = fsdevMountDevice("save", tmpfs);
-        if (ret==-1) {
-            printf("fsdevMountDevice() failed.\n");
-            rc = ret;
+        rc = fsdevMountSaveData("save", titleID, userID);//See also libnx fs.h/fs_dev.h
+        if (R_FAILED(rc)) {
+            printf("fsdevMountSaveData() failed: 0x%x\n", rc);
         }
     }