Skip to content

Commit 35f5a55

Browse files
committed
testsuite: refactor nested ternary statements to if in afpclient
1 parent ca40cc7 commit 35f5a55

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

test/testsuite/afpclient.c

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,8 +2037,14 @@ unsigned int AFPReadFooter(DSI *dsi, uint16_t fork _U_, int offset _U_,
20372037
rsize = ntohl(dsi->header.dsi_len);
20382038
rsize -= dsi->cmdlen;
20392039
my_dsi_stream_read(dsi, data + dsi->cmdlen, rsize);
2040-
return dsi->header.dsi_code ? dsi->header.dsi_code : (rsize + dsi->cmdlen ==
2041-
size) ? 0 : -1;
2040+
2041+
if (dsi->header.dsi_code) {
2042+
return dsi->header.dsi_code;
2043+
} else if (rsize + dsi->cmdlen == size) {
2044+
return 0;
2045+
} else {
2046+
return -1;
2047+
}
20422048
}
20432049

20442050
/* ------------------------------- */
@@ -2094,8 +2100,14 @@ unsigned int AFPRead_ext(CONN *conn, uint16_t fork, off_t offset, off_t size,
20942100
rsize = ntohl(dsi->header.dsi_len);
20952101
rsize -= dsi->cmdlen;
20962102
my_dsi_stream_read(dsi, data + dsi->cmdlen, rsize);
2097-
return dsi->header.dsi_code ? dsi->header.dsi_code : (rsize + dsi->cmdlen ==
2098-
size) ? 0 : -1;
2103+
2104+
if (dsi->header.dsi_code) {
2105+
return dsi->header.dsi_code;
2106+
} else if (rsize + dsi->cmdlen == size) {
2107+
return 0;
2108+
} else {
2109+
return -1;
2110+
}
20992111
}
21002112

21012113
unsigned int AFPRead_ext_async(CONN *conn, uint16_t fork, off_t offset,

0 commit comments

Comments
 (0)