Skip to content

Commit eb398bd

Browse files
joel16joel16
committed
net: minor code consistency changes
1 parent 954c24d commit eb398bd

1 file changed

Lines changed: 48 additions & 24 deletions

File tree

‎app/source/net.cpp‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,57 +19,73 @@ namespace Flash {
1919
void Init(void) {
2020
unsigned int ret = 0;
2121

22-
if ((R_FAILED(ret = sceIoUnassign("flash0:"))) && (ret != 0x80020321))
22+
if ((R_FAILED(ret = sceIoUnassign("flash0:"))) && (ret != 0x80020321)) {
2323
Log::Error("sceIoUnassign(flash0) failed: 0x%x\n", ret);
24+
}
2425

25-
if (R_FAILED(ret = sceIoAssign("flash0:", "lflash0:0,0", "flashfat0:", IOASSIGN_RDWR, nullptr, 0)))
26+
if (R_FAILED(ret = sceIoAssign("flash0:", "lflash0:0,0", "flashfat0:", IOASSIGN_RDWR, nullptr, 0))) {
2627
Log::Error("sceIoAssign(flash0) failed: 0x%x\n", ret);
28+
}
2729

28-
if ((R_FAILED(ret = sceIoUnassign("flash1:"))) && (ret != 0x80020321))
30+
if ((R_FAILED(ret = sceIoUnassign("flash1:"))) && (ret != 0x80020321)) {
2931
Log::Error("sceIoUnassign(flash1) failed: 0x%x\n", ret);
32+
}
3033

31-
if (R_FAILED(ret = sceIoAssign("flash1:", "lflash0:0,1", "flashfat1:", IOASSIGN_RDWR, nullptr, 0)))
34+
if (R_FAILED(ret = sceIoAssign("flash1:", "lflash0:0,1", "flashfat1:", IOASSIGN_RDWR, nullptr, 0))) {
3235
Log::Error("sceIoAssign(flash1) failed: 0x%x\n", ret);
36+
}
3337

34-
if ((R_FAILED(ret = sceIoUnassign("flash2:"))) && (ret != 0x80020321))
38+
if ((R_FAILED(ret = sceIoUnassign("flash2:"))) && (ret != 0x80020321)) {
3539
Log::Error("sceIoUnassign(flash2) failed: 0x%x\n", ret);
40+
}
3641

37-
if (R_FAILED(ret = sceIoAssign("flash2:", "lflash0:0,2", "flashfat2:", IOASSIGN_RDWR, nullptr, 0)))
42+
if (R_FAILED(ret = sceIoAssign("flash2:", "lflash0:0,2", "flashfat2:", IOASSIGN_RDWR, nullptr, 0))) {
3843
Log::Error("sceIoAssign(flash2) failed: 0x%x\n", ret);
44+
}
3945

40-
if ((R_FAILED(ret = sceIoUnassign("flash3:"))) && (ret != 0x80020321))
46+
if ((R_FAILED(ret = sceIoUnassign("flash3:"))) && (ret != 0x80020321)) {
4147
Log::Error("sceIoUnassign(flash3) failed: 0x%x\n", ret);
48+
}
4249

43-
if (R_FAILED(ret = sceIoAssign("flash3:", "lflash0:0,3", "flashfat3:", IOASSIGN_RDWR, nullptr, 0)))
50+
if (R_FAILED(ret = sceIoAssign("flash3:", "lflash0:0,3", "flashfat3:", IOASSIGN_RDWR, nullptr, 0))) {
4451
Log::Error("sceIoAssign(flash3) failed: 0x%x\n", ret);
52+
}
4553
}
4654

4755
void Exit(void) {
4856
unsigned int ret = 0;
4957

50-
if ((R_FAILED(ret = sceIoUnassign("flash0:"))) && (ret != 0x80020321))
58+
if ((R_FAILED(ret = sceIoUnassign("flash0:"))) && (ret != 0x80020321)) {
5159
Log::Error("sceIoUnassign(flash0) failed: 0x%x\n", ret);
60+
}
5261

53-
if (R_FAILED(ret = sceIoAssign("flash0:", "lflash0:0,0", "flashfat0:", IOASSIGN_RDONLY, nullptr, 0)))
62+
if (R_FAILED(ret = sceIoAssign("flash0:", "lflash0:0,0", "flashfat0:", IOASSIGN_RDONLY, nullptr, 0))) {
5463
Log::Error("sceIoAssign(flash0) failed: 0x%x\n", ret);
64+
}
5565

56-
if ((R_FAILED(ret = sceIoUnassign("flash1:"))) && (ret != 0x80020321))
66+
if ((R_FAILED(ret = sceIoUnassign("flash1:"))) && (ret != 0x80020321)) {
5767
Log::Error("sceIoUnassign(flash1) failed: 0x%x\n", ret);
68+
}
5869

59-
if (R_FAILED(ret = sceIoAssign("flash1:", "lflash0:0,1", "flashfat1:", IOASSIGN_RDONLY, nullptr, 0)))
70+
if (R_FAILED(ret = sceIoAssign("flash1:", "lflash0:0,1", "flashfat1:", IOASSIGN_RDONLY, nullptr, 0))) {
6071
Log::Error("sceIoAssign(flash1) failed: 0x%x\n", ret);
72+
}
6173

62-
if ((R_FAILED(ret = sceIoUnassign("flash2:"))) && (ret != 0x80020321))
74+
if ((R_FAILED(ret = sceIoUnassign("flash2:"))) && (ret != 0x80020321)) {
6375
Log::Error("sceIoUnassign(flash2) failed: 0x%x\n", ret);
76+
}
6477

65-
if (R_FAILED(ret = sceIoAssign("flash2:", "lflash0:0,2", "flashfat2:", IOASSIGN_RDONLY, nullptr, 0)))
78+
if (R_FAILED(ret = sceIoAssign("flash2:", "lflash0:0,2", "flashfat2:", IOASSIGN_RDONLY, nullptr, 0))) {
6679
Log::Error("sceIoAssign(flash2) failed: 0x%x\n", ret);
80+
}
6781

68-
if ((R_FAILED(ret = sceIoUnassign("flash3:"))) && (ret != 0x80020321))
82+
if ((R_FAILED(ret = sceIoUnassign("flash3:"))) && (ret != 0x80020321)) {
6983
Log::Error("sceIoUnassign(flash3) failed: 0x%x\n", ret);
84+
}
7085

71-
if (R_FAILED(ret = sceIoAssign("flash3:", "lflash0:0,3", "flashfat3:", IOASSIGN_RDONLY, nullptr, 0)))
86+
if (R_FAILED(ret = sceIoAssign("flash3:", "lflash0:0,3", "flashfat3:", IOASSIGN_RDONLY, nullptr, 0))) {
7287
Log::Error("sceIoAssign(flash3) failed: 0x%x\n", ret);
88+
}
7389
}
7490
}
7591

@@ -202,11 +218,13 @@ namespace Net {
202218
ftppsp_add_device("ms0:");
203219
ftppsp_add_device("ef0:");
204220
}
205-
else
221+
else {
206222
ftppsp_add_device("ef0:");
223+
}
207224
}
208-
else
225+
else {
209226
ftppsp_add_device("ms0:");
227+
}
210228

211229
if (cfg.dev_options) {
212230
Flash::Init();
@@ -216,11 +234,13 @@ namespace Net {
216234
ftppsp_add_device("flash3:");
217235

218236
if (sceUmdCheckMedium() != 0) {
219-
if (R_FAILED(ret = sceUmdActivate(1, "disc0:")))
237+
if (R_FAILED(ret = sceUmdActivate(1, "disc0:"))) {
220238
Log::Error("sceUmdActivate(disc0) failed: 0x%x\n", ret);
239+
}
221240

222-
if (R_FAILED(ret = sceUmdWaitDriveStat(PSP_UMD_READY)))
241+
if (R_FAILED(ret = sceUmdWaitDriveStat(PSP_UMD_READY))) {
223242
Log::Error("sceUmdWaitDriveStat() failed: 0x%x\n", ret);
243+
}
224244

225245
ftppsp_add_device("disc0:");
226246
}
@@ -229,8 +249,9 @@ namespace Net {
229249
if (ret < 0) {
230250
std::snprintf(string, 19, "Connection Failed.");
231251
}
232-
else
252+
else {
233253
std::snprintf(string, 36, "FTP Connected %s:%i", psp_ip, psp_port);
254+
}
234255

235256
return true;
236257
}
@@ -241,8 +262,9 @@ namespace Net {
241262
ftppsp_del_device("ms0:");
242263
ftppsp_del_device("ef0:");
243264
}
244-
else
265+
else {
245266
ftppsp_del_device("ef0:");
267+
}
246268
}
247269
else
248270
ftppsp_del_device("ms0:");
@@ -257,17 +279,19 @@ namespace Net {
257279
if (sceUmdCheckMedium() != 0) {
258280
int ret = 0;
259281

260-
if (R_FAILED(ret = sceUmdDeactivate(1, "disc0:")))
282+
if (R_FAILED(ret = sceUmdDeactivate(1, "disc0:"))) {
261283
Log::Error("sceUmdDeactivate(disc0) failed: 0x%x\n", ret);
284+
}
262285

263286
ftppsp_del_device("disc0:");
264287
}
265288
}
266289

267290
ftppsp_fini();
268291

269-
if (cfg.dev_options)
292+
if (cfg.dev_options) {
270293
Flash::Exit();
294+
}
271295

272296
Net::Exit();
273297

0 commit comments

Comments
 (0)