diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-05-02 22:02:05 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-05-02 22:02:05 +0000 |
| commit | a59b767b38f08c0dafc011a58e8791aa06d4feb0 (patch) | |
| tree | 8be0500cec5edb562779bc41f0ef7ad46b8c86fc /lib/sg_pt_win32.c | |
| parent | f65566c3934a9e22335dee20401cc1cc50865d56 (diff) | |
| download | sg3_utils-a59b767b38f08c0dafc011a58e8791aa06d4feb0.tar.gz | |
sg_lib: add sg_ll_inquiry_pt(), sg_ll_test_unit_ready_progress_pt(), sg_ll_request_sense_pt(), sg_ll_send_diag_pt(), sg_ll_receive_diag_pt(); sg_timestamp: add --elapsed, --hex and --no-timestamp options; sg_ses: check for NVMe enclosure bits
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@769 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib/sg_pt_win32.c')
| -rw-r--r-- | lib/sg_pt_win32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sg_pt_win32.c b/lib/sg_pt_win32.c index bdb2808e..1fbb6d2f 100644 --- a/lib/sg_pt_win32.c +++ b/lib/sg_pt_win32.c @@ -5,7 +5,7 @@ * license that can be found in the BSD_LICENSE file. */ -/* sg_pt_win32 version 1.24 20180309 */ +/* sg_pt_win32 version 1.25 20180427 */ #include <stdio.h> #include <stdlib.h> @@ -1536,7 +1536,7 @@ nvme_identify(struct sg_pt_win32_scsi * psp, struct sg_pt_handle * shp, sizeof(STORAGE_PROTOCOL_SPECIFIC_DATA) + n; buffer = sg_memalign(bufferLength, pg_sz, &free_buffer, false); if (buffer == NULL) { - res = SG_LIB_OS_BASE_ERR + ENOMEM; + res = sg_convert_errno(ENOMEM); if (vb > 1) pr2ws("%s: unable to allocate memory\n", __func__); psp->os_err = res; @@ -1626,7 +1626,7 @@ nvme_get_features(struct sg_pt_win32_scsi * psp, struct sg_pt_handle * shp, sizeof(STORAGE_PROTOCOL_SPECIFIC_DATA) + n; buffer = sg_memalign(bufferLength, pg_sz, &free_buffer, false); if (buffer == NULL) { - res = SG_LIB_OS_BASE_ERR + ENOMEM; + res = sg_convert_errno(ENOMEM); if (vb > 1) pr2ws("%s: unable to allocate memory\n", __func__); psp->os_err = res; @@ -1705,7 +1705,7 @@ nvme_get_log_page(struct sg_pt_win32_scsi * psp, struct sg_pt_handle * shp, sizeof(STORAGE_PROTOCOL_SPECIFIC_DATA) + n; buffer = sg_memalign(bufferLength, pg_sz, &free_buffer, false); if (buffer == NULL) { - res = SG_LIB_OS_BASE_ERR + ENOMEM; + res = sg_convert_errno(ENOMEM); if (vb > 1) pr2ws("%s: unable to allocate memory\n", __func__); psp->os_err = res; @@ -1787,7 +1787,7 @@ nvme_real_pt(struct sg_pt_win32_scsi * psp, struct sg_pt_handle * shp, sizeof(NVME_ERROR_INFO_LOG) + n; buffer = sg_memalign(bufferLength, pg_sz, &free_buffer, false); if (buffer == NULL) { - res = SG_LIB_OS_BASE_ERR + ENOMEM; + res = sg_convert_errno(ENOMEM); if (vb > 1) pr2ws("%s: unable to allocate memory\n", __func__); psp->os_err = res; @@ -2014,7 +2014,7 @@ do_nvme_admin_cmd(struct sg_pt_win32_scsi * psp, struct sg_pt_handle * shp, pthru = (NVME_PASS_THROUGH_IOCTL *)sg_memalign(alloc_len, pg_sz, &free_pthru, false); if (NULL == pthru) { - res = SG_LIB_OS_BASE_ERR + ENOMEM; + res = sg_convert_errno(ENOMEM); if (vb > 1) pr2ws("%s: unable to allocate memory\n", __func__); psp->os_err = res; |