Skip to content

Commit 474f67f

Browse files
committed
plugins/wdc: Fix code scanning alert
Fix the comparison of narrow type with wide type in loop condition. Note: Include some coding style errors fixes. Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
1 parent 83aad43 commit 474f67f

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

plugins/wdc/wdc-nvme.c

+17-18
Original file line numberDiff line numberDiff line change
@@ -9648,10 +9648,10 @@ static int wdc_fetch_log_file_from_device(struct nvme_dev *dev, __u32 fileId,
96489648
__u16 spiDestn, __u64 fileSize, __u8 *dataBuffer)
96499649
{
96509650
int ret = WDC_STATUS_FAILURE;
9651-
__u32 chunckSize = WDC_DE_VU_READ_BUFFER_STANDARD_OFFSET;
9652-
__u32 maximumTransferLength = 0;
9653-
__u32 buffSize = 0;
9654-
__u64 offsetIdx = 0;
9651+
__u32 chunckSize = WDC_DE_VU_READ_BUFFER_STANDARD_OFFSET;
9652+
__u32 maximumTransferLength = 0;
9653+
__u32 buffSize = 0;
9654+
__u64 offsetIdx = 0;
96559655

96569656
if (!dev || !dataBuffer || !fileSize) {
96579657
ret = WDC_STATUS_INVALID_PARAMETER;
@@ -9699,18 +9699,17 @@ static int wdc_fetch_log_file_from_device(struct nvme_dev *dev, __u32 fileId,
96999699

97009700
static int wdc_de_get_dump_trace(struct nvme_dev *dev, char *filePath, __u16 binFileNameLen, char *binFileName)
97019701
{
9702-
int ret = WDC_STATUS_FAILURE;
9703-
__u8 *readBuffer = NULL;
9704-
__u32 readBufferLen = 0;
9705-
__u32 lastPktReadBufferLen = 0;
9706-
__u32 maxTransferLen = 0;
9707-
__u32 dumptraceSize = 0;
9708-
__u32 chunkSize = 0;
9709-
__u32 chunks = 0;
9710-
__u32 offset = 0;
9711-
__u8 loop = 0;
9712-
__u16 i = 0;
9713-
__u32 maximumTransferLength = 0;
9702+
int ret = WDC_STATUS_FAILURE;
9703+
__u8 *readBuffer = NULL;
9704+
__u32 readBufferLen = 0;
9705+
__u32 lastPktReadBufferLen = 0;
9706+
__u32 maxTransferLen = 0;
9707+
__u32 dumptraceSize = 0;
9708+
__u32 chunkSize;
9709+
__u32 chunks;
9710+
__u32 offset;
9711+
__u32 i;
9712+
__u32 maximumTransferLength = 0;
97149713

97159714
if (!dev || !binFileName || !filePath) {
97169715
ret = WDC_STATUS_INVALID_PARAMETER;
@@ -9759,7 +9758,7 @@ static int wdc_de_get_dump_trace(struct nvme_dev *dev, char *filePath, __u16 bin
97599758
}
97609759

97619760
for (i = 0; i < chunks; i++) {
9762-
offset = ((i*chunkSize) / 4);
9761+
offset = (i * chunkSize) / 4;
97639762

97649763
/* Last loop call, Assign readBufferLen to read only left over bytes */
97659764
if (i == (chunks - 1))
@@ -9774,7 +9773,7 @@ static int wdc_de_get_dump_trace(struct nvme_dev *dev, char *filePath, __u16 bin
97749773
break;
97759774
}
97769775
}
9777-
} while (loop);
9776+
} while (0);
97789777

97799778
if (ret == WDC_STATUS_SUCCESS) {
97809779
ret = wdc_WriteToFile(binFileName, (char *)readBuffer, dumptraceSize);

0 commit comments

Comments
 (0)