summaryrefslogtreecommitdiff
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorGravatar David Marcec2018-11-27 12:29:06 +1100
committerGravatar David Marcec2018-11-27 12:29:06 +1100
commitf271316822c8887b1b6dfeff0803077f5ec2c0a8 (patch)
treee8144d94031332ca7439edb80ee2823774bd8a99 /src/core/hle/service
parentFixed hwopus compile error (diff)
downloadyuzu-f271316822c8887b1b6dfeff0803077f5ec2c0a8.tar.gz
yuzu-f271316822c8887b1b6dfeff0803077f5ec2c0a8.tar.xz
yuzu-f271316822c8887b1b6dfeff0803077f5ec2c0a8.zip
Reworked svcs slightly, improved error messages in AM and fsp_srv
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/am/am.cpp6
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp12
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index f6757adab..d595c37b0 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -616,7 +616,8 @@ private:
616 616
617 const auto storage = applet->GetBroker().PopNormalDataToGame(); 617 const auto storage = applet->GetBroker().PopNormalDataToGame();
618 if (storage == nullptr) { 618 if (storage == nullptr) {
619 LOG_ERROR(Service_AM, "storage is a nullptr. There is no data in the current channel"); 619 LOG_ERROR(Service_AM,
620 "storage is a nullptr. There is no data in the current normal channel");
620 621
621 rb.Push(ERR_NO_DATA_IN_CHANNEL); 622 rb.Push(ERR_NO_DATA_IN_CHANNEL);
622 return; 623 return;
@@ -647,7 +648,8 @@ private:
647 648
648 const auto storage = applet->GetBroker().PopInteractiveDataToGame(); 649 const auto storage = applet->GetBroker().PopInteractiveDataToGame();
649 if (storage == nullptr) { 650 if (storage == nullptr) {
650 LOG_ERROR(Service_AM, "storage is a nullptr. There is no data in the current channel"); 651 LOG_ERROR(Service_AM,
652 "storage is a nullptr. There is no data in the current interactive channel");
651 653
652 rb.Push(ERR_NO_DATA_IN_CHANNEL); 654 rb.Push(ERR_NO_DATA_IN_CHANNEL);
653 return; 655 return;
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 233cb302f..99d9ebc39 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -62,13 +62,13 @@ private:
62 62
63 // Error checking 63 // Error checking
64 if (length < 0) { 64 if (length < 0) {
65 LOG_ERROR(Service_FS, "Invalid length provided"); 65 LOG_ERROR(Service_FS, "Length is less than 0, length={}", length);
66 IPC::ResponseBuilder rb{ctx, 2}; 66 IPC::ResponseBuilder rb{ctx, 2};
67 rb.Push(FileSys::ERROR_INVALID_SIZE); 67 rb.Push(FileSys::ERROR_INVALID_SIZE);
68 return; 68 return;
69 } 69 }
70 if (offset < 0) { 70 if (offset < 0) {
71 LOG_ERROR(Service_FS, "Invalid offset provided"); 71 LOG_ERROR(Service_FS, "Offset is less than 0, offset={}", offset);
72 IPC::ResponseBuilder rb{ctx, 2}; 72 IPC::ResponseBuilder rb{ctx, 2};
73 rb.Push(FileSys::ERROR_INVALID_OFFSET); 73 rb.Push(FileSys::ERROR_INVALID_OFFSET);
74 return; 74 return;
@@ -109,13 +109,13 @@ private:
109 109
110 // Error checking 110 // Error checking
111 if (length < 0) { 111 if (length < 0) {
112 LOG_ERROR(Service_FS, "Invalid length provided"); 112 LOG_ERROR(Service_FS, "Length is less than 0, length={}", length);
113 IPC::ResponseBuilder rb{ctx, 2}; 113 IPC::ResponseBuilder rb{ctx, 2};
114 rb.Push(FileSys::ERROR_INVALID_SIZE); 114 rb.Push(FileSys::ERROR_INVALID_SIZE);
115 return; 115 return;
116 } 116 }
117 if (offset < 0) { 117 if (offset < 0) {
118 LOG_ERROR(Service_FS, "Invalid offset provided"); 118 LOG_ERROR(Service_FS, "Offset is less than 0, offset={}", offset);
119 IPC::ResponseBuilder rb{ctx, 2}; 119 IPC::ResponseBuilder rb{ctx, 2};
120 rb.Push(FileSys::ERROR_INVALID_OFFSET); 120 rb.Push(FileSys::ERROR_INVALID_OFFSET);
121 return; 121 return;
@@ -142,13 +142,13 @@ private:
142 142
143 // Error checking 143 // Error checking
144 if (length < 0) { 144 if (length < 0) {
145 LOG_ERROR(Service_FS, "Invalid length provided"); 145 LOG_ERROR(Service_FS, "Length is less than 0, length={}", length);
146 IPC::ResponseBuilder rb{ctx, 2}; 146 IPC::ResponseBuilder rb{ctx, 2};
147 rb.Push(FileSys::ERROR_INVALID_SIZE); 147 rb.Push(FileSys::ERROR_INVALID_SIZE);
148 return; 148 return;
149 } 149 }
150 if (offset < 0) { 150 if (offset < 0) {
151 LOG_ERROR(Service_FS, "Invalid offset provided"); 151 LOG_ERROR(Service_FS, "Offset is less than 0, offset={}", offset);
152 IPC::ResponseBuilder rb{ctx, 2}; 152 IPC::ResponseBuilder rb{ctx, 2};
153 rb.Push(FileSys::ERROR_INVALID_OFFSET); 153 rb.Push(FileSys::ERROR_INVALID_OFFSET);
154 return; 154 return;