diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-07-06 16:48:38 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-07-06 16:48:38 +0000 |
| commit | 8b85eae099c9a554538b7051b0a047ddd0528554 (patch) | |
| tree | 403772d5c315c866f0f8aa2cb1bdafa93b008ad8 /lib/sg_lib.c | |
| parent | 3ef8550a26c95c97f9fdc4ef249a5767fd573e7a (diff) | |
| download | sg3_utils-8b85eae099c9a554538b7051b0a047ddd0528554.tar.gz | |
sg_pr2serr.h: add sg_scnpr() [like lk scnprintf()]; rescan-scsi-bus.sh code_manpage cleanup
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@780 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib/sg_lib.c')
| -rw-r--r-- | lib/sg_lib.c | 1022 |
1 files changed, 514 insertions, 508 deletions
diff --git a/lib/sg_lib.c b/lib/sg_lib.c index fd1b12c3..405328df 100644 --- a/lib/sg_lib.c +++ b/lib/sg_lib.c @@ -51,6 +51,8 @@ #define ASCQ_ATA_PT_INFO_AVAILABLE 0x1d /* corresponding ASC is 0 */ +typedef unsigned int my_uint; /* convenience to save a few line wraps */ + FILE * sg_warnings_strm = NULL; /* would like to default to stderr */ @@ -66,22 +68,16 @@ pr2ws(const char * fmt, ...) return n; } -#if defined(__GNUC__) || defined(__clang__) -static int scnpr(char * cp, int cp_max_len, const char * fmt, ...) - __attribute__ ((format (printf, 3, 4))); -#else -static int scnpr(char * cp, int cp_max_len, const char * fmt, ...); -#endif - /* Want safe, 'n += snprintf(b + n, blen - n, ...)' style sequence of * functions. Returns number of chars placed in cp excluding the * trailing null char. So for cp_max_len > 0 the return value is always * < cp_max_len; for cp_max_len <= 1 the return value is 0 and no chars are * written to cp. Note this means that when cp_max_len = 1, this function * assumes that cp[0] is the null character and does nothing (and returns - * 0). Linux kernel has a similar function called scnprintf(). */ -static int -scnpr(char * cp, int cp_max_len, const char * fmt, ...) + * 0). Linux kernel has a similar function called scnprintf(). Public + * declaration in sg_pr2serr.h header */ +int +sg_scnpr(char * cp, int cp_max_len, const char * fmt, ...) { va_list args; int n; @@ -208,9 +204,9 @@ sg_get_scsi_status_str(int scsi_status, int buff_len, char * buff) break; } if (sstatus_p->name) - scnpr(buff, buff_len, "%s", sstatus_p->name); + sg_scnpr(buff, buff_len, "%s", sstatus_p->name); else - scnpr(buff, buff_len, "Unknown status [0x%x]", scsi_status); + sg_scnpr(buff, buff_len, "Unknown status [0x%x]", scsi_status); } void @@ -251,9 +247,9 @@ sg_get_sense_key_str(int sense_key, int buff_len, char * buff) return buff; } if ((sense_key >= 0) && (sense_key < 16)) - scnpr(buff, buff_len, "%s", sg_lib_sense_key_desc[sense_key]); + sg_scnpr(buff, buff_len, "%s", sg_lib_sense_key_desc[sense_key]); else - scnpr(buff, buff_len, "invalid value: 0x%x", sense_key); + sg_scnpr(buff, buff_len, "invalid value: 0x%x", sense_key); return buff; } @@ -276,9 +272,9 @@ sg_get_asc_ascq_str(int asc, int ascq, int buff_len, char * buff) (ascq >= ei2p->ascq_min) && (ascq <= ei2p->ascq_max)) { found = true; - num = scnpr(buff, buff_len, "Additional sense: "); + num = sg_scnpr(buff, buff_len, "Additional sense: "); rlen = buff_len - num; - scnpr(buff + num, ((rlen > 0) ? rlen : 0), ei2p->text, ascq); + sg_scnpr(buff + num, ((rlen > 0) ? rlen : 0), ei2p->text, ascq); } } if (found) @@ -289,18 +285,18 @@ sg_get_asc_ascq_str(int asc, int ascq, int buff_len, char * buff) if (eip->asc == asc && eip->ascq == ascq) { found = true; - scnpr(buff, buff_len, "Additional sense: %s", eip->text); + sg_scnpr(buff, buff_len, "Additional sense: %s", eip->text); } } if (! found) { if (asc >= 0x80) - scnpr(buff, buff_len, "vendor specific ASC=%02x, ASCQ=%02x " - "(hex)", asc, ascq); + sg_scnpr(buff, buff_len, "vendor specific ASC=%02x, ASCQ=%02x " + "(hex)", asc, ascq); else if (ascq >= 0x80) - scnpr(buff, buff_len, "ASC=%02x, vendor specific qualification " - "ASCQ=%02x (hex)", asc, ascq); + sg_scnpr(buff, buff_len, "ASC=%02x, vendor specific qualification " + "ASCQ=%02x (hex)", asc, ascq); else - scnpr(buff, buff_len, "ASC=%02x, ASCQ=%02x (hex)", asc, ascq); + sg_scnpr(buff, buff_len, "ASC=%02x, ASCQ=%02x (hex)", asc, ascq); } return buff; } @@ -505,9 +501,9 @@ char * sg_get_pdt_str(int pdt, int buff_len, char * buff) { if ((pdt < 0) || (pdt > 31)) - scnpr(buff, buff_len, "bad pdt"); + sg_scnpr(buff, buff_len, "bad pdt"); else - scnpr(buff, buff_len, "%s", sg_lib_pdt_strs[pdt]); + sg_scnpr(buff, buff_len, "%s", sg_lib_pdt_strs[pdt]); return buff; } @@ -523,9 +519,9 @@ char * sg_get_trans_proto_str(int tpi, int buff_len, char * buff) { if ((tpi < 0) || (tpi > 15)) - scnpr(buff, buff_len, "bad tpi"); + sg_scnpr(buff, buff_len, "bad tpi"); else - scnpr(buff, buff_len, "%s", sg_lib_transport_proto_strs[tpi]); + sg_scnpr(buff, buff_len, "%s", sg_lib_transport_proto_strs[tpi]); return buff; } @@ -552,71 +548,74 @@ sg_decode_transportid_str(const char * lip, uint8_t * bp, int bplen, if ((k > 0) && only_one) break; if ((bplen < 24) || (0 != (bplen % 4))) - n += scnpr(b + n, blen - n, "%sTransport Id short or not " - "multiple of 4 [length=%d]:\n", lip, blen); + n += sg_scnpr(b + n, blen - n, "%sTransport Id short or not " + "multiple of 4 [length=%d]:\n", lip, blen); else - n += scnpr(b + n, blen - n, "%sTransport Id of initiator:\n", - lip); + n += sg_scnpr(b + n, blen - n, "%sTransport Id of initiator:\n", + lip); tpid_format = ((bp[0] >> 6) & 0x3); proto_id = (bp[0] & 0xf); normal_len = (bplen > TRANSPORT_ID_MIN_LEN) ? TRANSPORT_ID_MIN_LEN : bplen; switch (proto_id) { case TPROTO_FCP: /* Fibre channel */ - n += scnpr(b + n, blen - n, "%s FCP-2 World Wide Name:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s FCP-2 World Wide Name:\n", + lip); if (0 != tpid_format) - n += scnpr(b + n, blen - n, "%s [Unexpected TPID format: " - "%d]\n", lip, tpid_format); + n += sg_scnpr(b + n, blen - n, "%s [Unexpected TPID format: " + "%d]\n", lip, tpid_format); n += hex2str(bp + 8, 8, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_SPI: /* Scsi Parallel Interface, obsolete */ - n += scnpr(b + n, blen - n, "%s Parallel SCSI initiator SCSI " - "address: 0x%x\n", lip, sg_get_unaligned_be16(bp + 2)); + n += sg_scnpr(b + n, blen - n, "%s Parallel SCSI initiator SCSI " + "address: 0x%x\n", lip, + sg_get_unaligned_be16(bp + 2)); if (0 != tpid_format) - n += scnpr(b + n, blen - n, "%s [Unexpected TPID format: " - "%d]\n", lip, tpid_format); - n += scnpr(b + n, blen - n, "%s relative port number (of " - "corresponding target): 0x%x\n", lip, - sg_get_unaligned_be16(bp + 6)); + n += sg_scnpr(b + n, blen - n, "%s [Unexpected TPID format: " + "%d]\n", lip, tpid_format); + n += sg_scnpr(b + n, blen - n, "%s relative port number (of " + "corresponding target): 0x%x\n", lip, + sg_get_unaligned_be16(bp + 6)); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_SSA: - n += scnpr(b + n, blen - n, "%s SSA (transport id not " - "defined):\n", lip); - n += scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, - tpid_format); + n += sg_scnpr(b + n, blen - n, "%s SSA (transport id not " + "defined):\n", lip); + n += sg_scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, + tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_1394: /* IEEE 1394 */ - n += scnpr(b + n, blen - n, "%s IEEE 1394 EUI-64 name:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s IEEE 1394 EUI-64 name:\n", + lip); if (0 != tpid_format) - n += scnpr(b + n, blen - n, "%s [Unexpected TPID format: " - "%d]\n", lip, tpid_format); + n += sg_scnpr(b + n, blen - n, "%s [Unexpected TPID format: " + "%d]\n", lip, tpid_format); n += hex2str(&bp[8], 8, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_SRP: /* SCSI over RDMA */ - n += scnpr(b + n, blen - n, "%s RDMA initiator port " - "identifier:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s RDMA initiator port " + "identifier:\n", lip); if (0 != tpid_format) - n += scnpr(b + n, blen - n, "%s [Unexpected TPID format: " - "%d]\n", lip, tpid_format); + n += sg_scnpr(b + n, blen - n, "%s [Unexpected TPID format: " + "%d]\n", lip, tpid_format); n += hex2str(bp + 8, 16, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_ISCSI: - n += scnpr(b + n, blen - n, "%s iSCSI ", lip); + n += sg_scnpr(b + n, blen - n, "%s iSCSI ", lip); num = sg_get_unaligned_be16(bp + 2); if (0 == tpid_format) - n += scnpr(b + n, blen - n, "name: %.*s\n", num, &bp[4]); + n += sg_scnpr(b + n, blen - n, "name: %.*s\n", num, &bp[4]); else if (1 == tpid_format) - n += scnpr(b + n, blen - n, "world wide unique port id: " - "%.*s\n", num, &bp[4]); + n += sg_scnpr(b + n, blen - n, "world wide unique port id: " + "%.*s\n", num, &bp[4]); else { - n += scnpr(b + n, blen - n, " [Unexpected TPID format: " - "%d]\n", tpid_format); + n += sg_scnpr(b + n, blen - n, " [Unexpected TPID format: " + "%d]\n", tpid_format); n += hex2str(bp, num + 4, lip, 0, blen - n, b + n); } bump = (((num + 4) < TRANSPORT_ID_MIN_LEN) ? @@ -624,62 +623,63 @@ sg_decode_transportid_str(const char * lip, uint8_t * bp, int bplen, break; case TPROTO_SAS: ull = sg_get_unaligned_be64(bp + 4); - n += scnpr(b + n, blen - n, "%s SAS address: 0x%" PRIx64 "\n", - lip, ull); + n += sg_scnpr(b + n, blen - n, "%s SAS address: 0x%" PRIx64 "\n", + lip, ull); if (0 != tpid_format) - n += scnpr(b + n, blen - n, "%s [Unexpected TPID format: " - "%d]\n", lip, tpid_format); + n += sg_scnpr(b + n, blen - n, "%s [Unexpected TPID format: " + "%d]\n", lip, tpid_format); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_ADT: /* no TransportID defined by T10 yet */ - n += scnpr(b + n, blen - n, "%s ADT:\n", lip); - n += scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, - tpid_format); + n += sg_scnpr(b + n, blen - n, "%s ADT:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, + tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_ATA: /* no TransportID defined by T10 yet */ - n += scnpr(b + n, blen - n, "%s ATAPI:\n", lip); - n += scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, - tpid_format); + n += sg_scnpr(b + n, blen - n, "%s ATAPI:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, + tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_UAS: /* no TransportID defined by T10 yet */ - n += scnpr(b + n, blen - n, "%s UAS:\n", lip); - n += scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, - tpid_format); + n += sg_scnpr(b + n, blen - n, "%s UAS:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, + tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_SOP: - n += scnpr(b + n, blen - n, "%s SOP ", lip); + n += sg_scnpr(b + n, blen - n, "%s SOP ", lip); num = sg_get_unaligned_be16(bp + 2); if (0 == tpid_format) - n += scnpr(b + n, blen - n, "Routing ID: 0x%x\n", num); + n += sg_scnpr(b + n, blen - n, "Routing ID: 0x%x\n", num); else { - n += scnpr(b + n, blen - n, " [Unexpected TPID format: " - "%d]\n", tpid_format); + n += sg_scnpr(b + n, blen - n, " [Unexpected TPID format: " + "%d]\n", tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); } bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_PCIE: /* no TransportID defined by T10 yet */ - n += scnpr(b + n, blen - n, "%s PCIE:\n", lip); - n += scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, - tpid_format); + n += sg_scnpr(b + n, blen - n, "%s PCIE:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s TPID format: %d\n", lip, + tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; case TPROTO_NONE: /* no TransportID defined by T10 */ - n += scnpr(b + n, blen - n, "%s No specified protocol\n", lip); + n += sg_scnpr(b + n, blen - n, "%s No specified protocol\n", + lip); /* n += hex2str(bp, ((bplen > 24) ? 24 : bplen), * lip, 0, blen - n, b + n); */ bump = TRANSPORT_ID_MIN_LEN; break; default: - n += scnpr(b + n, blen - n, "%s unknown protocol id=0x%x " - "TPID format=%d\n", lip, proto_id, tpid_format); + n += sg_scnpr(b + n, blen - n, "%s unknown protocol id=0x%x " + "TPID format=%d\n", lip, proto_id, tpid_format); n += hex2str(bp, normal_len, lip, 1, blen - n, b + n); bump = TRANSPORT_ID_MIN_LEN; break; @@ -769,14 +769,14 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, if (NULL == lip) lip = ""; if (dd_len < 4) { - n += scnpr(b + n, blen - n, "%sdesignator desc too short: got " - "length of %d want 4 or more\n", lip, dd_len); + n += sg_scnpr(b + n, blen - n, "%sdesignator desc too short: got " + "length of %d want 4 or more\n", lip, dd_len); return n; } dlen = ddp[3]; if (dlen > (dd_len - 4)) { - n += scnpr(b + n, blen - n, "%sdesignator too long: says it is %d " - "bytes, but given %d bytes\n", lip, dlen, dd_len - 4); + n += sg_scnpr(b + n, blen - n, "%sdesignator too long: says it is %d " + "bytes, but given %d bytes\n", lip, dlen, dd_len - 4); return n; } ip = ddp + 4; @@ -786,19 +786,19 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, assoc = ((ddp[1] >> 4) & 0x3); desig_type = (ddp[1] & 0xf); if (print_assoc && ((cp = sg_get_desig_assoc_str(assoc)))) - n += scnpr(b + n, blen - n, "%s %s:\n", lip, cp); - n += scnpr(b + n, blen - n, "%s designator type: ", lip); + n += sg_scnpr(b + n, blen - n, "%s %s:\n", lip, cp); + n += sg_scnpr(b + n, blen - n, "%s designator type: ", lip); cp = sg_get_desig_type_str(desig_type); if (cp) - n += scnpr(b + n, blen - n, "%s", cp); - n += scnpr(b + n, blen - n, ", code set: "); + n += sg_scnpr(b + n, blen - n, "%s", cp); + n += sg_scnpr(b + n, blen - n, ", code set: "); cp = sg_get_desig_code_set_str(c_set); if (cp) - n += scnpr(b + n, blen - n, "%s", cp); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%s", cp); + n += sg_scnpr(b + n, blen - n, "\n"); if (piv && ((1 == assoc) || (2 == assoc))) - n += scnpr(b + n, blen - n, "%s transport: %s\n", lip, - sg_get_trans_proto_str(p_id, sizeof(e), e)); + n += sg_scnpr(b + n, blen - n, "%s transport: %s\n", lip, + sg_get_trans_proto_str(p_id, sizeof(e), e)); /* printf(" associated with the %s\n", sdparm_assoc_arr[assoc]); */ switch (desig_type) { case 0: /* vendor specific */ @@ -810,47 +810,47 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, k = 1; } if (k) - n += scnpr(b + n, blen - n, "%s vendor specific: %.*s\n", - lip, dlen, ip); + n += sg_scnpr(b + n, blen - n, "%s vendor specific: %.*s\n", + lip, dlen, ip); else { - n += scnpr(b + n, blen - n, "%s vendor specific:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s vendor specific:\n", lip); n += hex2str(ip, dlen, lip, 0, blen - n, b + n); } break; case 1: /* T10 vendor identification */ - n += scnpr(b + n, blen - n, "%s vendor id: %.8s\n", lip, ip); + n += sg_scnpr(b + n, blen - n, "%s vendor id: %.8s\n", lip, ip); if (dlen > 8) { if ((2 == c_set) || (3 == c_set)) { /* ASCII or UTF-8 */ - n += scnpr(b + n, blen - n, "%s vendor specific: " - "%.*s\n", lip, dlen - 8, ip + 8); + n += sg_scnpr(b + n, blen - n, "%s vendor specific: " + "%.*s\n", lip, dlen - 8, ip + 8); } else { - n += scnpr(b + n, blen - n, "%s vendor specific: 0x", - lip); + n += sg_scnpr(b + n, blen - n, "%s vendor specific: 0x", + lip); for (m = 8; m < dlen; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "\n"); } } break; case 2: /* EUI-64 based */ if (! do_long) { if ((8 != dlen) && (12 != dlen) && (16 != dlen)) { - n += scnpr(b + n, blen - n, "%s << expect 8, 12 and 16 " - "byte EUI, got %d >>\n", lip, dlen); - n += hex2str(ip, dlen, lip, 1, blen - n, b + n); + n += sg_scnpr(b + n, blen - n, "%s << expect 8, 12 and " + "16 byte EUI, got %d >>\n", lip, dlen); + n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } - n += scnpr(b + n, blen - n, "%s 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s 0x", lip); for (m = 0; m < dlen; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "\n"); break; } - n += scnpr(b + n, blen - n, "%s EUI-64 based %d byte " - "identifier\n", lip, dlen); + n += sg_scnpr(b + n, blen - n, "%s EUI-64 based %d byte " + "identifier\n", lip, dlen); if (1 != c_set) { - n += scnpr(b + n, blen - n, "%s << expected binary code_set " - "(1) >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << expected binary " + "code_set (1) >>\n", lip); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } @@ -858,35 +858,35 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, if (16 == dlen) { ci_off = 8; id_ext = sg_get_unaligned_be64(ip); - n += scnpr(b + n, blen - n, "%s Identifier extension: 0x%" - PRIx64 "\n", lip, id_ext); + n += sg_scnpr(b + n, blen - n, "%s Identifier extension: 0x%" + PRIx64 "\n", lip, id_ext); } else if ((8 != dlen) && (12 != dlen)) { - n += scnpr(b + n, blen - n, "%s << can only decode 8, 12 " - "and 16 byte ids >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << can only decode 8, 12 " + "and 16 byte ids >>\n", lip); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } c_id = sg_get_unaligned_be24(ip + ci_off); - n += scnpr(b + n, blen - n, "%s IEEE Company_id: 0x%x\n", lip, - c_id); + n += sg_scnpr(b + n, blen - n, "%s IEEE Company_id: 0x%x\n", lip, + c_id); vsei = 0; for (m = 0; m < 5; ++m) { if (m > 0) vsei <<= 8; vsei |= ip[ci_off + 3 + m]; } - n += scnpr(b + n, blen - n, "%s Vendor Specific Extension " - "Identifier: 0x%" PRIx64 "\n", lip, vsei); + n += sg_scnpr(b + n, blen - n, "%s Vendor Specific Extension " + "Identifier: 0x%" PRIx64 "\n", lip, vsei); if (12 == dlen) { d_id = sg_get_unaligned_be32(ip + 8); - n += scnpr(b + n, blen - n, "%s Directory ID: 0x%x\n", lip, - d_id); + n += sg_scnpr(b + n, blen - n, "%s Directory ID: 0x%x\n", + lip, d_id); } break; case 3: /* NAA <n> */ if (1 != c_set) { - n += scnpr(b + n, blen - n, "%s << unexpected code set %d " - "for NAA >>\n", lip, c_set); + n += sg_scnpr(b + n, blen - n, "%s << unexpected code set " + "%d for NAA >>\n", lip, c_set); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } @@ -894,8 +894,8 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, switch (naa) { case 2: /* NAA 2: IEEE Extended */ if (8 != dlen) { - n += scnpr(b + n, blen - n, "%s << unexpected NAA 2 " - "identifier length: 0x%x >>\n", lip, dlen); + n += sg_scnpr(b + n, blen - n, "%s << unexpected NAA 2 " + "identifier length: 0x%x >>\n", lip, dlen); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } @@ -903,41 +903,41 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, c_id = sg_get_unaligned_be24(ip + 2); vsi = sg_get_unaligned_be24(ip + 5); if (do_long) { - n += scnpr(b + n, blen - n, "%s NAA 2, vendor specific " - "identifier A: 0x%x\n", lip, d_id); - n += scnpr(b + n, blen - n, "%s IEEE Company_id: 0x%x\n", - lip, c_id); - n += scnpr(b + n, blen - n, "%s vendor specific " - "identifier B: 0x%x\n", lip, vsi); - n += scnpr(b + n, blen - n, "%s [0x", lip); + n += sg_scnpr(b + n, blen - n, "%s NAA 2, vendor " + "specific identifier A: 0x%x\n", lip, d_id); + n += sg_scnpr(b + n, blen - n, "%s IEEE Company_id: " + "0x%x\n", lip, c_id); + n += sg_scnpr(b + n, blen - n, "%s vendor specific " + "identifier B: 0x%x\n", lip, vsi); + n += sg_scnpr(b + n, blen - n, "%s [0x", lip); for (m = 0; m < 8; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "]\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "]\n"); } - n += scnpr(b + n, blen - n, "%s 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s 0x", lip); for (m = 0; m < 8; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "\n"); break; case 3: /* NAA 3: Locally assigned */ if (8 != dlen) { - n += scnpr(b + n, blen - n, "%s << unexpected NAA 3 " - "identifier length: 0x%x >>\n", lip, dlen); + n += sg_scnpr(b + n, blen - n, "%s << unexpected NAA 3 " + "identifier length: 0x%x >>\n", lip, dlen); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } if (do_long) - n += scnpr(b + n, blen - n, "%s NAA 3, Locally " - "assigned:\n", lip); - n += scnpr(b + n, blen - n, "%s 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s NAA 3, Locally " + "assigned:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s 0x", lip); for (m = 0; m < 8; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "\n"); break; case 5: /* NAA 5: IEEE Registered */ if (8 != dlen) { - n += scnpr(b + n, blen - n, "%s << unexpected NAA 5 " - "identifier length: 0x%x >>\n", lip, dlen); + n += sg_scnpr(b + n, blen - n, "%s << unexpected NAA 5 " + "identifier length: 0x%x >>\n", lip, dlen); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } @@ -949,25 +949,25 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, vsei |= ip[3 + m]; } if (do_long) { - n += scnpr(b + n, blen - n, "%s NAA 5, IEEE " - "Company_id: 0x%x\n", lip, c_id); - n += scnpr(b + n, blen - n, "%s Vendor Specific " - "Identifier: 0x%" PRIx64 "\n", lip, vsei); - n += scnpr(b + n, blen - n, "%s [0x", lip); + n += sg_scnpr(b + n, blen - n, "%s NAA 5, IEEE " + "Company_id: 0x%x\n", lip, c_id); + n += sg_scnpr(b + n, blen - n, "%s Vendor Specific " + "Identifier: 0x%" PRIx64 "\n", lip, vsei); + n += sg_scnpr(b + n, blen - n, "%s [0x", lip); for (m = 0; m < 8; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "]\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "]\n"); } else { - n += scnpr(b + n, blen - n, "%s 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s 0x", lip); for (m = 0; m < 8; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "\n"); } break; case 6: /* NAA 6: IEEE Registered extended */ if (16 != dlen) { - n += scnpr(b + n, blen - n, "%s << unexpected NAA 6 " - "identifier length: 0x%x >>\n", lip, dlen); + n += sg_scnpr(b + n, blen - n, "%s << unexpected NAA 6 " + "identifier length: 0x%x >>\n", lip, dlen); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } @@ -979,157 +979,157 @@ sg_get_designation_descriptor_str(const char * lip, const uint8_t * ddp, vsei |= ip[3 + m]; } if (do_long) { - n += scnpr(b + n, blen - n, "%s NAA 6, IEEE " - "Company_id: 0x%x\n", lip, c_id); - n += scnpr(b + n, blen - n, "%s Vendor Specific " - "Identifier: 0x%" PRIx64 "\n", lip, vsei); + n += sg_scnpr(b + n, blen - n, "%s NAA 6, IEEE " + "Company_id: 0x%x\n", lip, c_id); + n += sg_scnpr(b + n, blen - n, "%s Vendor Specific " + "Identifier: 0x%" PRIx64 "\n", lip, vsei); vsei = sg_get_unaligned_be64(ip + 8); - n += scnpr(b + n, blen - n, "%s Vendor Specific " - "Identifier Extension: 0x%" PRIx64 "\n", lip, - vsei); - n += scnpr(b + n, blen - n, "%s [0x", lip); + n += sg_scnpr(b + n, blen - n, "%s Vendor Specific " + "Identifier Extension: 0x%" PRIx64 "\n", lip, + vsei); + n += sg_scnpr(b + n, blen - n, "%s [0x", lip); for (m = 0; m < 16; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "]\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "]\n"); } else { - n += scnpr(b + n, blen - n, "%s 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s 0x", lip); for (m = 0; m < 16; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[m]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[m]); + n += sg_scnpr(b + n, blen - n, "\n"); } break; default: - n += scnpr(b + n, blen - n, "%s << unexpected NAA [0x%x] " - ">>\n", lip, naa); + n += sg_scnpr(b + n, blen - n, "%s << unexpected NAA [0x%x] " + ">>\n", lip, naa); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } break; case 4: /* Relative target port */ if ((1 != c_set) || (1 != assoc) || (4 != dlen)) { - n += scnpr(b + n, blen - n, "%s << expected binary " - "code_set, target port association, length 4 >>\n", - lip); + n += sg_scnpr(b + n, blen - n, "%s << expected binary " + "code_set, target port association, length 4 >>\n", + lip); n += hex2str(ip, dlen, "", 1, blen - n, b + n); break; } d_id = sg_get_unaligned_be16(ip + 2); - n += scnpr(b + n, blen - n, "%s Relative target port: 0x%x\n", - lip, d_id); + n += sg_scnpr(b + n, blen - n, "%s Relative target port: 0x%x\n", + lip, d_id); break; case 5: /* (primary) Target port group */ if ((1 != c_set) || (1 != assoc) || (4 != dlen)) { - n += scnpr(b + n, blen - n, "%s << expected binary " - "code_set, target port association, length 4 >>\n", - lip); + n += sg_scnpr(b + n, blen - n, "%s << expected binary " + "code_set, target port association, length 4 >>\n", + lip); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } d_id = sg_get_unaligned_be16(ip + 2); - n += scnpr(b + n, blen - n, "%s Target port group: 0x%x\n", lip, - d_id); + n += sg_scnpr(b + n, blen - n, "%s Target port group: 0x%x\n", + lip, d_id); break; case 6: /* Logical unit group */ if ((1 != c_set) || (0 != assoc) || (4 != dlen)) { - n += scnpr(b + n, blen - n, "%s << expected binary " - "code_set, logical unit association, length 4 >>\n", - lip); + n += sg_scnpr(b + n, blen - n, "%s << expected binary " + "code_set, logical unit association, length 4 >>\n", + lip); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } d_id = sg_get_unaligned_be16(ip + 2); - n += scnpr(b + n, blen - n, "%s Logical unit group: 0x%x\n", lip, - d_id); + n += sg_scnpr(b + n, blen - n, "%s Logical unit group: 0x%x\n", + lip, d_id); break; case 7: /* MD5 logical unit identifier */ if ((1 != c_set) || (0 != assoc)) { - n += scnpr(b + n, blen - n, "%s << expected binary " - "code_set, logical unit association >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << expected binary " + "code_set, logical unit association >>\n", lip); n += hex2str(ip, dlen, "", 1, blen - n, b + n); break; } - n += scnpr(b + n, blen - n, "%s MD5 logical unit identifier:\n", - lip); + n += sg_scnpr(b + n, blen - n, "%s MD5 logical unit " + "identifier:\n", lip); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; case 8: /* SCSI name string */ if (3 != c_set) { /* accept ASCII as subset of UTF-8 */ if (2 == c_set) { if (do_long) - n += scnpr(b + n, blen - n, "%s << expected UTF-8, " - "use ASCII >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << expected " + "UTF-8, use ASCII >>\n", lip); } else { - n += scnpr(b + n, blen - n, "%s << expected UTF-8 " - "code_set >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << expected UTF-8 " + "code_set >>\n", lip); n += hex2str(ip, dlen, lip, 0, blen - n, b + n); break; } } - n += scnpr(b + n, blen - n, "%s SCSI name string:\n", lip); + n += sg_scnpr(b + n, blen - n, "%s SCSI name string:\n", lip); /* does %s print out UTF-8 ok?? * Seems to depend on the locale. Looks ok here with my * locale setting: en_AU.UTF-8 */ - n += scnpr(b + n, blen - n, "%s %.*s\n", lip, dlen, - (const char *)ip); + n += sg_scnpr(b + n, blen - n, "%s %.*s\n", lip, dlen, + (const char *)ip); break; case 9: /* Protocol specific port identifier */ /* added in spc4r36, PIV must be set, proto_id indicates */ /* whether UAS (USB) or SOP (PCIe) or ... */ if (! piv) - n += scnpr(b + n, blen - n, " %s >>>> Protocol specific " - "port identifier expects protocol\n" - "%s identifier to be valid and it is not\n", - lip, lip); + n += sg_scnpr(b + n, blen - n, " %s >>>> Protocol specific " + "port identifier expects protocol\n%s " + "identifier to be valid and it is not\n", lip, lip); if (TPROTO_UAS == p_id) { - n += scnpr(b + n, blen - n, "%s USB device address: 0x%x\n", - lip, 0x7f & ip[0]); - n += scnpr(b + n, blen - n, "%s USB interface number: " - "0x%x\n", lip, ip[2]); + n += sg_scnpr(b + n, blen - n, "%s USB device address: " + "0x%x\n", lip, 0x7f & ip[0]); + n += sg_scnpr(b + n, blen - n, "%s USB interface number: " + "0x%x\n", lip, ip[2]); } else if (TPROTO_SOP == p_id) { - n += scnpr(b + n, blen - n, "%s PCIe routing ID, bus " - "number: 0x%x\n", lip, ip[0]); - n += scnpr(b + n, blen - n, "%s function number: 0x%x\n", - lip, ip[1]); - n += scnpr(b + n, blen - n, "%s [or device number: " - "0x%x, function number: 0x%x]\n", lip, - (0x1f & (ip[1] >> 3)), 0x7 & ip[1]); + n += sg_scnpr(b + n, blen - n, "%s PCIe routing ID, bus " + "number: 0x%x\n", lip, ip[0]); + n += sg_scnpr(b + n, blen - n, "%s function number: " + "0x%x\n", lip, ip[1]); + n += sg_scnpr(b + n, blen - n, "%s [or device number: " + "0x%x, function number: 0x%x]\n", lip, + (0x1f & (ip[1] >> 3)), 0x7 & ip[1]); } else - n += scnpr(b + n, blen - n, "%s >>>> unexpected protocol " - "indentifier: %s\n%s with Protocol specific " - "port identifier\n", lip, - sg_get_trans_proto_str(p_id, sizeof(e), e), lip); + n += sg_scnpr(b + n, blen - n, "%s >>>> unexpected protocol " + "identifier: %s\n%s with Protocol " + "specific port identifier\n", lip, + sg_get_trans_proto_str(p_id, sizeof(e), e), lip); break; case 0xa: /* UUID identifier */ if (1 != c_set) { - n += scnpr(b + n, blen - n, "%s << expected binary " - "code_set >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << expected binary " + "code_set >>\n", lip); n += hex2str(ip, dlen, lip, 0, blen - n, b + n); break; } if ((1 != ((ip[0] >> 4) & 0xf)) || (18 != dlen)) { - n += scnpr(b + n, blen - n, "%s << expected locally " - "assigned UUID, 16 bytes long >>\n", lip); + n += sg_scnpr(b + n, blen - n, "%s << expected locally " + "assigned UUID, 16 bytes long >>\n", lip); n += hex2str(ip, dlen, lip, 0, blen - n, b + n); break; } - n += scnpr(b + n, blen - n, "%s Locally assigned UUID: ", lip); + n += sg_scnpr(b + n, blen - n, "%s Locally assigned UUID: ", + lip); for (m = 0; m < 16; ++m) { if ((4 == m) || (6 == m) || (8 == m) || (10 == m)) - n += scnpr(b + n, blen - n, "-"); - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[2 + m]); + n += sg_scnpr(b + n, blen - n, "-"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[2 + m]); } - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "\n"); if (do_long) { - n += scnpr(b + n, blen - n, "%s [0x", lip); + n += sg_scnpr(b + n, blen - n, "%s [0x", lip); for (m = 0; m < 16; ++m) - n += scnpr(b + n, blen - n, "%02x", (unsigned int)ip[2 + m]); - n += scnpr(b + n, blen - n, "]\n"); + n += sg_scnpr(b + n, blen - n, "%02x", (my_uint)ip[2 + m]); + n += sg_scnpr(b + n, blen - n, "]\n"); } break; default: /* reserved */ - n += scnpr(b + n, blen - n, "%s reserved designator=0x%x\n", lip, - desig_type); + n += sg_scnpr(b + n, blen - n, "%s reserved designator=0x%x\n", + lip, desig_type); n += hex2str(ip, dlen, lip, 1, blen - n, b + n); break; } @@ -1148,66 +1148,66 @@ decode_sks(const char * lip, const uint8_t * descp, int add_d_len, switch (sense_key) { case SPC_SK_ILLEGAL_REQUEST: if (add_d_len < 6) { - n += scnpr(b + n, blen - n, "Field pointer: "); + n += sg_scnpr(b + n, blen - n, "Field pointer: "); goto too_short; } /* abbreviate to fit on one line */ - n += scnpr(b + n, blen - n, "Field pointer:\n"); - n += scnpr(b + n, blen - n, "%s Error in %s: byte %d", lip, - (descp[4] & 0x40) ? "Command" : - "Data parameters", - sg_get_unaligned_be16(descp + 5)); + n += sg_scnpr(b + n, blen - n, "Field pointer:\n"); + n += sg_scnpr(b + n, blen - n, "%s Error in %s: byte %d", lip, + (descp[4] & 0x40) ? "Command" : "Data parameters", + sg_get_unaligned_be16(descp + 5)); if (descp[4] & 0x08) { - n += scnpr(b + n, blen - n, " bit %d\n", descp[4] & 0x07); + n += sg_scnpr(b + n, blen - n, " bit %d\n", descp[4] & 0x07); } else - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "\n"); break; case SPC_SK_HARDWARE_ERROR: case SPC_SK_MEDIUM_ERROR: case SPC_SK_RECOVERED_ERROR: - n += scnpr(b + n, blen - n, "Actual retry count: "); + n += sg_scnpr(b + n, blen - n, "Actual retry count: "); if (add_d_len < 6) goto too_short; - n += scnpr(b + n, blen - n,"%u\n", sg_get_unaligned_be16(descp + 5)); + n += sg_scnpr(b + n, blen - n,"%u\n", + sg_get_unaligned_be16(descp + 5)); break; case SPC_SK_NO_SENSE: case SPC_SK_NOT_READY: - n += scnpr(b + n, blen - n, "Progress indication: "); + n += sg_scnpr(b + n, blen - n, "Progress indication: "); if (add_d_len < 6) goto too_short; progress = sg_get_unaligned_be16(descp + 5); pr = (progress * 100) / 65536; rem = ((progress * 100) % 65536) / 656; - n += scnpr(b + n, blen - n, "%d.%02d%%\n", pr, rem); + n += sg_scnpr(b + n, blen - n, "%d.%02d%%\n", pr, rem); break; case SPC_SK_COPY_ABORTED: - n += scnpr(b + n, blen - n, "Segment pointer:\n"); + n += sg_scnpr(b + n, blen - n, "Segment pointer:\n"); if (add_d_len < 6) goto too_short; - n += scnpr(b + n, blen - n, "%s Relative to start of %s, byte " - "%d", lip, (descp[4] & 0x20) ? "segment descriptor" : - "parameter list", - sg_get_unaligned_be16(descp + 5)); + n += sg_scnpr(b + n, blen - n, "%s Relative to start of %s, " + "byte %d", lip, (descp[4] & 0x20) ? + "segment descriptor" : "parameter list", + sg_get_unaligned_be16(descp + 5)); if (descp[4] & 0x08) - n += scnpr(b + n, blen - n, " bit %d\n", descp[4] & 0x07); + n += sg_scnpr(b + n, blen - n, " bit %d\n", descp[4] & 0x07); else - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "\n"); break; case SPC_SK_UNIT_ATTENTION: - n += scnpr(b + n, blen - n, "Unit attention condition queue:\n"); - n += scnpr(b + n, blen - n, "%s overflow flag is %d\n", lip, - !!(descp[4] & 0x1)); + n += sg_scnpr(b + n, blen - n, "Unit attention condition queue:\n"); + n += sg_scnpr(b + n, blen - n, "%s overflow flag is %d\n", lip, + !!(descp[4] & 0x1)); break; default: - n += scnpr(b + n, blen - n, "Sense_key: 0x%x unexpected\n", - sense_key); + n += sg_scnpr(b + n, blen - n, "Sense_key: 0x%x unexpected\n", + sense_key); *processedp = false; break; } return n; too_short: - n += scnpr(b + n, blen - n, "%s\n", " >> descriptor too short"); + n += sg_scnpr(b + n, blen - n, "%s\n", " >> descriptor too short"); *processedp = false; return n; } @@ -1224,19 +1224,19 @@ decode_tpgs_state(int st, char * b, int blen) { switch (st) { case TPGS_STATE_OPTIMIZED: - return scnpr(b, blen, "active/optimized"); + return sg_scnpr(b, blen, "active/optimized"); case TPGS_STATE_NONOPTIMIZED: - return scnpr(b, blen, "active/non optimized"); + return sg_scnpr(b, blen, "active/non optimized"); case TPGS_STATE_STANDBY: - return scnpr(b, blen, "standby"); + return sg_scnpr(b, blen, "standby"); case TPGS_STATE_UNAVAILABLE: - return scnpr(b, blen, "unavailable"); + return sg_scnpr(b, blen, "unavailable"); case TPGS_STATE_OFFLINE: - return scnpr(b, blen, "offline"); + return sg_scnpr(b, blen, "offline"); case TPGS_STATE_TRANSITIONING: - return scnpr(b, blen, "transitioning between states"); + return sg_scnpr(b, blen, "transitioning between states"); default: - return scnpr(b, blen, "unknown: 0x%x", st); + return sg_scnpr(b, blen, "unknown: 0x%x", st); } } @@ -1253,29 +1253,29 @@ uds_referral_descriptor_str(char * b, int blen, const uint8_t * dp, if (NULL == lip) lip = ""; - n += scnpr(b + n, blen - n, "%s Not all referrals: %d\n", lip, - !!(dp[2] & 0x1)); + n += sg_scnpr(b + n, blen - n, "%s Not all referrals: %d\n", lip, + !!(dp[2] & 0x1)); dp += 4; for (k = 0, f = 1; (k + 4) < dlen; k += g, dp += g, ++f) { tpgd = dp[3]; g = (tpgd * 4) + 20; - n += scnpr(b + n, blen - n, "%s Descriptor %d\n", lip, f); + n += sg_scnpr(b + n, blen - n, "%s Descriptor %d\n", lip, f); if ((k + g) > dlen) { - n += scnpr(b + n, blen - n, "%s truncated descriptor, " - "stop\n", lip); + n += sg_scnpr(b + n, blen - n, "%s truncated descriptor, " + "stop\n", lip); return n; } ull = sg_get_unaligned_be64(dp + 4); - n += scnpr(b + n, blen - n, "%s first uds LBA: 0x%" PRIx64 "\n", - lip, ull); + n += sg_scnpr(b + n, blen - n, "%s first uds LBA: 0x%" PRIx64 + "\n", lip, ull); ull = sg_get_unaligned_be64(dp + 12); - n += scnpr(b + n, blen - n, "%s last uds LBA: 0x%" PRIx64 "\n", - lip, ull); + n += sg_scnpr(b + n, blen - n, "%s last uds LBA: 0x%" PRIx64 + "\n", lip, ull); for (j = 0; j < tpgd; ++j) { tp = dp + 20 + (j * 4); decode_tpgs_state(tp[0] & 0xf, c, sizeof(c)); - n += scnpr(b + n, blen - n, "%s tpg: %d state: %s\n", - lip, sg_get_unaligned_be16(tp + 2), c); + n += sg_scnpr(b + n, blen - n, "%s tpg: %d state: %s\n", + lip, sg_get_unaligned_be16(tp + 2), c); } } return n; @@ -1312,9 +1312,9 @@ sg_get_sense_descriptors_str(const char * lip, const uint8_t * sbp, return 0; b[0] = '\0'; if (lip) - scnpr(z, sizeof(z), "%.60s ", lip); + sg_scnpr(z, sizeof(z), "%.60s ", lip); else - scnpr(z, sizeof(z), " "); + sg_scnpr(z, sizeof(z), " "); if ((sb_len < 8) || (0 == (add_sb_len = sbp[7]))) return 0; add_sb_len = (add_sb_len < (sb_len - 8)) ? add_sb_len : (sb_len - 8); @@ -1327,152 +1327,153 @@ sg_get_sense_descriptors_str(const char * lip, const uint8_t * sbp, if ((k + add_d_len + 2) > add_sb_len) add_d_len = add_sb_len - k - 2; desc_len = add_d_len + 2; - n += scnpr(b + n, blen - n, "%s Descriptor type: ", lip); + n += sg_scnpr(b + n, blen - n, "%s Descriptor type: ", lip); processed = true; switch (descp[0]) { case 0: - n += scnpr(b + n, blen - n, "Information: "); + n += sg_scnpr(b + n, blen - n, "Information: "); if ((add_d_len >= 10) && (0x80 & descp[2])) { - n += scnpr(b + n, blen - n, "0x"); + n += sg_scnpr(b + n, blen - n, "0x"); for (j = 0; j < 8; ++j) - n += scnpr(b + n, blen - n, "%02x", descp[4 + j]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", descp[4 + j]); + n += sg_scnpr(b + n, blen - n, "\n"); } else { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; } break; case 1: - n += scnpr(b + n, blen - n, "Command specific: "); + n += sg_scnpr(b + n, blen - n, "Command specific: "); if (add_d_len >= 10) { - n += scnpr(b + n, blen - n, "0x"); + n += sg_scnpr(b + n, blen - n, "0x"); for (j = 0; j < 8; ++j) - n += scnpr(b + n, blen - n, "%02x", descp[4 + j]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", descp[4 + j]); + n += sg_scnpr(b + n, blen - n, "\n"); } else { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; } break; case 2: /* Sense Key Specific */ - n += scnpr(b + n, blen - n, "Sense key specific: "); + n += sg_scnpr(b + n, blen - n, "Sense key specific: "); n += decode_sks(lip, descp, add_d_len, sense_key, &processed, blen - n, b + n); break; case 3: - n += scnpr(b + n, blen - n, "Field replaceable unit code: "); + n += sg_scnpr(b + n, blen - n, "Field replaceable unit code: "); if (add_d_len >= 2) - n += scnpr(b + n, blen - n, "0x%x\n", descp[3]); + n += sg_scnpr(b + n, blen - n, "0x%x\n", descp[3]); else { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; } break; case 4: - n += scnpr(b + n, blen - n, "Stream commands: "); + n += sg_scnpr(b + n, blen - n, "Stream commands: "); if (add_d_len >= 2) { if (descp[3] & 0x80) - n += scnpr(b + n, blen - n, "FILEMARK"); + n += sg_scnpr(b + n, blen - n, "FILEMARK"); if (descp[3] & 0x40) - n += scnpr(b + n, blen - n, "End Of Medium (EOM)"); + n += sg_scnpr(b + n, blen - n, "End Of Medium (EOM)"); if (descp[3] & 0x20) - n += scnpr(b + n, blen - n, "Incorrect Length Indicator " - "(ILI)"); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "Incorrect Length " + "Indicator (ILI)"); + n += sg_scnpr(b + n, blen - n, "\n"); } else { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; } break; case 5: - n += scnpr(b + n, blen - n, "Block commands: "); + n += sg_scnpr(b + n, blen - n, "Block commands: "); if (add_d_len >= 2) - n += scnpr(b + n, blen - n, "Incorrect Length Indicator " - "(ILI) %s\n", (descp[3] & 0x20) ? "set" : "clear"); + n += sg_scnpr(b + n, blen - n, "Incorrect Length Indicator " + "(ILI) %s\n", + (descp[3] & 0x20) ? "set" : "clear"); else { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; } break; case 6: - n += scnpr(b + n, blen - n, "OSD object identification\n"); + n += sg_scnpr(b + n, blen - n, "OSD object identification\n"); processed = false; break; case 7: - n += scnpr(b + n, blen - n, "OSD response integrity check " - "value\n"); + n += sg_scnpr(b + n, blen - n, "OSD response integrity check " + "value\n"); processed = false; break; case 8: - n += scnpr(b + n, blen - n, "OSD attribute identification\n"); + n += sg_scnpr(b + n, blen - n, "OSD attribute identification\n"); processed = false; break; case 9: /* this is defined in SAT (SAT-2) */ - n += scnpr(b + n, blen - n, "ATA Status Return: "); + n += sg_scnpr(b + n, blen - n, "ATA Status Return: "); if (add_d_len >= 12) { int extend, count; extend = descp[2] & 1; count = descp[5] + (extend ? (descp[4] << 8) : 0); - n += scnpr(b + n, blen - n, "extend=%d error=0x%x \n%s" - " count=0x%x ", extend, descp[3], lip, - count); + n += sg_scnpr(b + n, blen - n, "extend=%d error=0x%x \n%s" + " count=0x%x ", extend, descp[3], lip, + count); if (extend) - n += scnpr(b + n, blen - n, - "lba=0x%02x%02x%02x%02x%02x%02x ", - descp[10], descp[8], descp[6], descp[11], - descp[9], descp[7]); + n += sg_scnpr(b + n, blen - n, + "lba=0x%02x%02x%02x%02x%02x%02x ", + descp[10], descp[8], descp[6], descp[11], + descp[9], descp[7]); else - n += scnpr(b + n, blen - n, "lba=0x%02x%02x%02x ", - descp[11], descp[9], descp[7]); - n += scnpr(b + n, blen - n, "device=0x%x status=0x%x\n", - descp[12], descp[13]); + n += sg_scnpr(b + n, blen - n, "lba=0x%02x%02x%02x ", + descp[11], descp[9], descp[7]); + n += sg_scnpr(b + n, blen - n, "device=0x%x status=0x%x\n", + descp[12], descp[13]); } else { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; } break; case 0xa: /* Added in SPC-4 rev 17, became 'Another ...' in rev 34 */ - n += scnpr(b + n, blen - n, "Another progress indication: "); + n += sg_scnpr(b + n, blen - n, "Another progress indication: "); if (add_d_len < 6) { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; break; } progress = sg_get_unaligned_be16(descp + 6); pr = (progress * 100) / 65536; rem = ((progress * 100) % 65536) / 656; - n += scnpr(b + n, blen - n, "%d.02%d%%\n", pr, rem); - n += scnpr(b + n, blen - n, "%s [sense_key=0x%x " - "asc,ascq=0x%x,0x%x]\n", lip, descp[2], descp[3], - descp[4]); + n += sg_scnpr(b + n, blen - n, "%d.02%d%%\n", pr, rem); + n += sg_scnpr(b + n, blen - n, "%s [sense_key=0x%x " + "asc,ascq=0x%x,0x%x]\n", lip, descp[2], descp[3], + descp[4]); break; case 0xb: /* Added in SPC-4 rev 23, defined in SBC-3 rev 22 */ - n += scnpr(b + n, blen - n, "User data segment referral: "); + n += sg_scnpr(b + n, blen - n, "User data segment referral: "); if (add_d_len < 2) { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; break; } - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "\n"); n += uds_referral_descriptor_str(b + n, blen - n, descp, add_d_len, lip); break; case 0xc: /* Added in SPC-4 rev 28 */ - n += scnpr(b + n, blen - n, "Forwarded sense data\n"); + n += sg_scnpr(b + n, blen - n, "Forwarded sense data\n"); if (add_d_len < 2) { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; break; } - n += scnpr(b + n, blen - n, "%s FSDT: %s\n", lip, - (descp[2] & 0x80) ? "set" : "clear"); + n += sg_scnpr(b + n, blen - n, "%s FSDT: %s\n", lip, + (descp[2] & 0x80) ? "set" : "clear"); j = descp[2] & 0xf; - n += scnpr(b + n, blen - n, "%s Sense data source: ", lip); + n += sg_scnpr(b + n, blen - n, "%s Sense data source: ", lip); switch (j) { case 0: - n += scnpr(b + n, blen - n, "%s source device\n", eccp); + n += sg_scnpr(b + n, blen - n, "%s source device\n", eccp); break; case 1: case 2: @@ -1481,125 +1482,127 @@ sg_get_sense_descriptors_str(const char * lip, const uint8_t * sbp, case 5: case 6: case 7: - n += scnpr(b + n, blen - n, "%s %s %d\n", eccp, ddp, j - 1); + n += sg_scnpr(b + n, blen - n, "%s %s %d\n", eccp, ddp, j - 1); break; default: - n += scnpr(b + n, blen - n, "unknown [%d]\n", j); + n += sg_scnpr(b + n, blen - n, "unknown [%d]\n", j); } { char c[480]; sg_get_scsi_status_str(descp[3], sizeof(c) - 1, c); c[sizeof(c) - 1] = '\0'; - n += scnpr(b + n, blen - n, "%s Forwarded status: %s\n", - lip, c); + n += sg_scnpr(b + n, blen - n, "%s Forwarded status: %s\n", + lip, c); if (add_d_len > 2) { /* recursing; hope not to get carried away */ - n += scnpr(b + n, blen - n, "%s vvvvvvvvvvvvvvvv\n", lip); + n += sg_scnpr(b + n, blen - n, "%s vvvvvvvvvvvvvvvv\n", + lip); sg_get_sense_str(lip, descp + 4, add_d_len - 2, false, sizeof(c), c); - n += scnpr(b + n, blen - n, "%s", c); - n += scnpr(b + n, blen - n, "%s ^^^^^^^^^^^^^^^^\n", lip); + n += sg_scnpr(b + n, blen - n, "%s", c); + n += sg_scnpr(b + n, blen - n, "%s ^^^^^^^^^^^^^^^^\n", + lip); } } break; case 0xd: /* Added in SBC-3 rev 36d */ /* this descriptor combines descriptors 0, 1, 2 and 3 */ - n += scnpr(b + n, blen - n, "Direct-access block device\n"); + n += sg_scnpr(b + n, blen - n, "Direct-access block device\n"); if (add_d_len < 28) { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; break; } if (0x20 & descp[2]) - n += scnpr(b + n, blen - n, "%s ILI (incorrect length " - "indication) set\n", lip); + n += sg_scnpr(b + n, blen - n, "%s ILI (incorrect length " + "indication) set\n", lip); if (0x80 & descp[4]) { - n += scnpr(b + n, blen - n, "%s Sense key specific: ", - lip); + n += sg_scnpr(b + n, blen - n, "%s Sense key specific: ", + lip); n += decode_sks(lip, descp, add_d_len, sense_key, &processed, blen - n, b + n); } - n += scnpr(b + n, blen - n, "%s Field replaceable unit code: " - "0x%x\n", lip, descp[7]); + n += sg_scnpr(b + n, blen - n, "%s Field replaceable unit " + "code: 0x%x\n", lip, descp[7]); if (0x80 & descp[2]) { - n += scnpr(b + n, blen - n, "%s Information: 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s Information: 0x", lip); for (j = 0; j < 8; ++j) - n += scnpr(b + n, blen - n, "%02x", descp[8 + j]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", descp[8 + j]); + n += sg_scnpr(b + n, blen - n, "\n"); } - n += scnpr(b + n, blen - n, "%s Command specific: 0x", lip); + n += sg_scnpr(b + n, blen - n, "%s Command specific: 0x", lip); for (j = 0; j < 8; ++j) - n += scnpr(b + n, blen - n, "%02x", descp[16 + j]); - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "%02x", descp[16 + j]); + n += sg_scnpr(b + n, blen - n, "\n"); break; case 0xe: /* Added in SPC-5 rev 6 (for Bind/Unbind) */ - n += scnpr(b + n, blen - n, "Device designation\n"); + n += sg_scnpr(b + n, blen - n, "Device designation\n"); j = (int)SG_ARRAY_SIZE(dd_usage_reason_str_arr); if (descp[3] < j) - n += scnpr(b + n, blen - n, "%s Usage reason: %s\n", lip, - dd_usage_reason_str_arr[descp[3]]); + n += sg_scnpr(b + n, blen - n, "%s Usage reason: %s\n", + lip, dd_usage_reason_str_arr[descp[3]]); else - n += scnpr(b + n, blen - n, "%s Usage reason: " - "reserved[%d]\n", lip, descp[3]); + n += sg_scnpr(b + n, blen - n, "%s Usage reason: " + "reserved[%d]\n", lip, descp[3]); n += sg_get_designation_descriptor_str(z, descp + 4, descp[1] - 2, true, false, blen - n, b + n); break; case 0xf: /* Added in SPC-5 rev 10 (for Write buffer) */ - n += scnpr(b + n, blen - n, "Microcode activation "); + n += sg_scnpr(b + n, blen - n, "Microcode activation "); if (add_d_len < 6) { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; break; } progress = sg_get_unaligned_be16(descp + 6); - n += scnpr(b + n, blen - n, "time: "); + n += sg_scnpr(b + n, blen - n, "time: "); if (0 == progress) - n += scnpr(b + n, blen - n, "unknown\n"); + n += sg_scnpr(b + n, blen - n, "unknown\n"); else - n += scnpr(b + n, blen - n, "%d seconds\n", progress); + n += sg_scnpr(b + n, blen - n, "%d seconds\n", progress); break; case 0xde: /* NVME Status Field; vendor (sg3_utils) specific */ - n += scnpr(b + n, blen - n, "NVMe Status: "); + n += sg_scnpr(b + n, blen - n, "NVMe Status: "); if (add_d_len < 6) { - n += scnpr(b + n, blen - n, "%s\n", dtsp); + n += sg_scnpr(b + n, blen - n, "%s\n", dtsp); processed = false; break; } - n += scnpr(b + n, blen - n, "DNR=%d, M=%d, ", - (int)!!(0x80 & descp[5]), (int)!!(0x40 & descp[5])); + n += sg_scnpr(b + n, blen - n, "DNR=%d, M=%d, ", + (int)!!(0x80 & descp[5]), (int)!!(0x40 & descp[5])); sct_sc = sg_get_unaligned_be16(descp + 6); - n += scnpr(b + n, blen - n, "SCT_SC=0x%x\n", sct_sc); + n += sg_scnpr(b + n, blen - n, "SCT_SC=0x%x\n", sct_sc); if (sct_sc > 0) { char d[80]; - n += scnpr(b + n, blen - n, " %s\n", - sg_get_nvme_cmd_status_str(sct_sc, sizeof(d), d)); + n += sg_scnpr(b + n, blen - n, " %s\n", + sg_get_nvme_cmd_status_str(sct_sc, sizeof(d), d)); } break; default: if (descp[0] >= 0x80) - n += scnpr(b + n, blen - n, "Vendor specific [0x%x]\n", - descp[0]); + n += sg_scnpr(b + n, blen - n, "Vendor specific [0x%x]\n", + descp[0]); else - n += scnpr(b + n, blen - n, "Unknown [0x%x]\n", descp[0]); + n += sg_scnpr(b + n, blen - n, "Unknown [0x%x]\n", descp[0]); processed = false; break; } if (! processed) { if (add_d_len > 0) { - n += scnpr(b + n, blen - n, "%s ", lip); + n += sg_scnpr(b + n, blen - n, "%s ", lip); for (j = 0; j < add_d_len; ++j) { if ((j > 0) && (0 == (j % 24))) - n += scnpr(b + n, blen - n, "\n%s ", lip); - n += scnpr(b + n, blen - n, "%02x ", descp[j + 2]); + n += sg_scnpr(b + n, blen - n, "\n%s ", lip); + n += sg_scnpr(b + n, blen - n, "%02x ", descp[j + 2]); } - n += scnpr(b + n, blen - n, "\n"); + n += sg_scnpr(b + n, blen - n, "\n"); } } if (add_d_len < 0) - n += scnpr(b + n, blen - n, "%s short descriptor\n", lip); + n += sg_scnpr(b + n, blen - n, "%s short descriptor\n", lip); } return n; } @@ -1620,20 +1623,20 @@ sg_get_sense_sat_pt_fixed_str(const char * lip, const uint8_t * sp, if (NULL == lip) lip = ""; if (SPC_SK_RECOVERED_ERROR != (0xf & sp[2])) - n += scnpr(b + n, blen - n, "%s >> expected Sense key: Recovered " - "Error ??\n", lip); + n += sg_scnpr(b + n, blen - n, "%s >> expected Sense key: Recovered " + "Error ??\n", lip); /* Fixed sense command-specific information field starts at sp + 8 */ extend = !!(0x80 & sp[8]); count_upper_nz = !!(0x40 & sp[8]); lba_upper_nz = !!(0x20 & sp[8]); /* Fixed sense information field starts at sp + 3 */ - n += scnpr(b + n, blen - n, "%s error=0x%x, status=0x%x, device=0x%x, " - "count(7:0)=0x%x%c\n", lip, sp[3], sp[4], sp[5], sp[6], - (count_upper_nz ? '+' : ' ')); - n += scnpr(b + n, blen - n, "%s extend=%d, log_index=0x%x, " - "lba_high,mid,low(7:0)=0x%x,0x%x,0x%x%c\n", lip, (int)extend, - (0xf & sp[8]), sp[9], sp[10], sp[11], - (lba_upper_nz ? '+' : ' ')); + n += sg_scnpr(b + n, blen - n, "%s error=0x%x, status=0x%x, " + "device=0x%x, count(7:0)=0x%x%c\n", lip, sp[3], sp[4], + sp[5], sp[6], (count_upper_nz ? '+' : ' ')); + n += sg_scnpr(b + n, blen - n, "%s extend=%d, log_index=0x%x, " + "lba_high,mid,low(7:0)=0x%x,0x%x,0x%x%c\n", lip, + (int)extend, (0xf & sp[8]), sp[9], sp[10], sp[11], + (lba_upper_nz ? '+' : ' ')); return n; } @@ -1664,7 +1667,7 @@ sg_get_sense_str(const char * lip, const uint8_t * sbp, int sb_len, if (NULL == lip) lip = ""; if ((NULL == sbp) || (sb_len < 1)) { - n += scnpr(cbp, cblen, "%s >>> sense buffer empty\n", lip); + n += sg_scnpr(cbp, cblen, "%s >>> sense buffer empty\n", lip); return n; } resp_code = 0x7f & sbp[0]; @@ -1699,144 +1702,145 @@ sg_get_sense_str(const char * lip, const uint8_t * sbp, int sb_len, ebp = "Response code: 0x0 (?)"; break; default: - scnpr(ebuff, sizeof(ebuff), "Unknown response code: 0x%x", - ssh.response_code); + sg_scnpr(ebuff, sizeof(ebuff), "Unknown response code: 0x%x", + ssh.response_code); ebp = ebuff; break; } - n += scnpr(cbp + n, cblen - n, "%s%s; Sense key: %s\n", lip, ebp, - sg_lib_sense_key_desc[ssh.sense_key]); + n += sg_scnpr(cbp + n, cblen - n, "%s%s; Sense key: %s\n", lip, ebp, + sg_lib_sense_key_desc[ssh.sense_key]); if (sdat_ovfl) - n += scnpr(cbp + n, cblen - n, "%s<<<Sense data overflow " - "(SDAT_OVFL)>>>\n", lip); + n += sg_scnpr(cbp + n, cblen - n, "%s<<<Sense data overflow " + "(SDAT_OVFL)>>>\n", lip); if (descriptor_format) { - n += scnpr(cbp + n, cblen - n, "%s%s\n", lip, - sg_get_asc_ascq_str(ssh.asc, ssh.ascq, blen, b)); + n += sg_scnpr(cbp + n, cblen - n, "%s%s\n", lip, + sg_get_asc_ascq_str(ssh.asc, ssh.ascq, blen, b)); n += sg_get_sense_descriptors_str(lip, sbp, len, cblen - n, cbp + n); } else if ((len > 12) && (0 == ssh.asc) && (ASCQ_ATA_PT_INFO_AVAILABLE == ssh.ascq)) { /* SAT ATA PASS-THROUGH fixed format */ - n += scnpr(cbp + n, cblen - n, "%s%s\n", lip, - sg_get_asc_ascq_str(ssh.asc, ssh.ascq, blen, b)); + n += sg_scnpr(cbp + n, cblen - n, "%s%s\n", lip, + sg_get_asc_ascq_str(ssh.asc, ssh.ascq, blen, b)); n += sg_get_sense_sat_pt_fixed_str(lip, sbp, len, cblen - n, cbp + n); } else if (len > 2) { /* fixed format */ if (len > 12) - n += scnpr(cbp + n, cblen - n, "%s%s\n", lip, - sg_get_asc_ascq_str(ssh.asc, ssh.ascq, blen, b)); + n += sg_scnpr(cbp + n, cblen - n, "%s%s\n", lip, + sg_get_asc_ascq_str(ssh.asc, ssh.ascq, blen, b)); r = 0; if (strlen(lip) > 0) - r += scnpr(b + r, blen - r, "%s", lip); + r += sg_scnpr(b + r, blen - r, "%s", lip); if (len > 6) { info = sg_get_unaligned_be32(sbp + 3); if (valid) - r += scnpr(b + r, blen - r, " Info fld=0x%x [%u] ", - info, info); + r += sg_scnpr(b + r, blen - r, " Info fld=0x%x [%u] ", + info, info); else if (info > 0) - r += scnpr(b + r, blen - r, " Valid=0, Info fld=0x%x " - "[%u] ", info, info); + r += sg_scnpr(b + r, blen - r, " Valid=0, Info fld=0x%x " + "[%u] ", info, info); } else info = 0; if (sbp[2] & 0xe0) { if (sbp[2] & 0x80) - r += scnpr(b + r, blen - r, " FMK"); + r += sg_scnpr(b + r, blen - r, " FMK"); /* current command has read a filemark */ if (sbp[2] & 0x40) - r += scnpr(b + r, blen - r, " EOM"); + r += sg_scnpr(b + r, blen - r, " EOM"); /* end-of-medium condition exists */ if (sbp[2] & 0x20) - r += scnpr(b + r, blen - r, " ILI"); + r += sg_scnpr(b + r, blen - r, " ILI"); /* incorrect block length requested */ - r += scnpr(b + r, blen - r, "\n"); + r += sg_scnpr(b + r, blen - r, "\n"); } else if (valid || (info > 0)) - r += scnpr(b + r, blen - r, "\n"); + r += sg_scnpr(b + r, blen - r, "\n"); if ((len >= 14) && sbp[14]) - r += scnpr(b + r, blen - r, "%s Field replaceable unit " - "code: %d\n", lip, sbp[14]); + r += sg_scnpr(b + r, blen - r, "%s Field replaceable unit " + "code: %d\n", lip, sbp[14]); if ((len >= 18) && (sbp[15] & 0x80)) { /* sense key specific decoding */ switch (ssh.sense_key) { case SPC_SK_ILLEGAL_REQUEST: - r += scnpr(b + r, blen - r, "%s Sense Key Specific: " - "Error in %s: byte %d", lip, - ((sbp[15] & 0x40) ? "Command" : - "Data parameters"), - sg_get_unaligned_be16(sbp + 16)); + r += sg_scnpr(b + r, blen - r, "%s Sense Key Specific: " + "Error in %s: byte %d", lip, + ((sbp[15] & 0x40) ? + "Command" : "Data parameters"), + sg_get_unaligned_be16(sbp + 16)); if (sbp[15] & 0x08) - r += scnpr(b + r, blen - r, " bit %d\n", - sbp[15] & 0x07); + r += sg_scnpr(b + r, blen - r, " bit %d\n", + sbp[15] & 0x07); else - r += scnpr(b + r, blen - r, "\n"); + r += sg_scnpr(b + r, blen - r, "\n"); break; case SPC_SK_NO_SENSE: case SPC_SK_NOT_READY: progress = sg_get_unaligned_be16(sbp + 16); pr = (progress * 100) / 65536; rem = ((progress * 100) % 65536) / 656; - r += scnpr(b + r, blen - r, "%s Progress indication: " - "%d.%02d%%\n", lip, pr, rem); + r += sg_scnpr(b + r, blen - r, "%s Progress indication: " + "%d.%02d%%\n", lip, pr, rem); break; case SPC_SK_HARDWARE_ERROR: case SPC_SK_MEDIUM_ERROR: case SPC_SK_RECOVERED_ERROR: - r += scnpr(b + r, blen - r, "%s Actual retry count: " - "0x%02x%02x\n", lip, sbp[16], sbp[17]); + r += sg_scnpr(b + r, blen - r, "%s Actual retry count: " + "0x%02x%02x\n", lip, sbp[16], sbp[17]); break; case SPC_SK_COPY_ABORTED: - r += scnpr(b + r, blen - r, "%s Segment pointer: ", lip); - r += scnpr(b + r, blen - r, "Relative to start of %s, " - "byte %d", ((sbp[15] & 0x20) ? + r += sg_scnpr(b + r, blen - r, "%s Segment pointer: ", + lip); + r += sg_scnpr(b + r, blen - r, "Relative to start of %s, " + "byte %d", ((sbp[15] & 0x20) ? "segment descriptor" : "parameter list"), - sg_get_unaligned_be16(sbp + 16)); + sg_get_unaligned_be16(sbp + 16)); if (sbp[15] & 0x08) - r += scnpr(b + r, blen - r, " bit %d\n", - sbp[15] & 0x07); + r += sg_scnpr(b + r, blen - r, " bit %d\n", + sbp[15] & 0x07); else - r += scnpr(b + r, blen - r, "\n"); + r += sg_scnpr(b + r, blen - r, "\n"); break; case SPC_SK_UNIT_ATTENTION: - r += scnpr(b + r, blen - r, "%s Unit attention " - "condition queue: ", lip); - r += scnpr(b + r, blen - r, "overflow flag is %d\n", - !!(sbp[15] & 0x1)); + r += sg_scnpr(b + r, blen - r, "%s Unit attention " + "condition queue: ", lip); + r += sg_scnpr(b + r, blen - r, "overflow flag is %d\n", + !!(sbp[15] & 0x1)); break; default: - r += scnpr(b + r, blen - r, "%s Sense_key: 0x%x " - "unexpected\n", lip, ssh.sense_key); + r += sg_scnpr(b + r, blen - r, "%s Sense_key: 0x%x " + "unexpected\n", lip, ssh.sense_key); break; } } if (r > 0) - n += scnpr(cbp + n, cblen - n, "%s", b); + n += sg_scnpr(cbp + n, cblen - n, "%s", b); } else - n += scnpr(cbp + n, cblen - n, "%s fixed descriptor length " - "too short, len=%d\n", lip, len); + n += sg_scnpr(cbp + n, cblen - n, "%s fixed descriptor length " + "too short, len=%d\n", lip, len); } else { /* unable to normalise sense buffer, something irregular */ if (sb_len < 4) { /* Too short */ - n += scnpr(cbp + n, cblen - n, "%ssense buffer too short (4 " - "byte minimum)\n", lip); + n += sg_scnpr(cbp + n, cblen - n, "%ssense buffer too short (4 " + "byte minimum)\n", lip); goto check_raw; } if (0x7f == resp_code) { /* Vendor specific */ - n += scnpr(cbp + n, cblen - n, "%sVendor specific sense buffer, " - "in hex:\n", lip); + n += sg_scnpr(cbp + n, cblen - n, "%sVendor specific sense " + "buffer, in hex:\n", lip); n += hex2str(sbp, sb_len, lip, -1, cblen - n, cbp + n); return n; /* no need to check raw, just output in hex */ } /* non-extended SCSI-1 sense data ?? */ r = 0; if (strlen(lip) > 0) - r += scnpr(b + r, blen - r, "%s", lip); - r += scnpr(b + r, blen - r, "Probably uninitialized data.\n%s Try " - "to view as SCSI-1 non-extended sense:\n", lip); - r += scnpr(b + r, blen - r, " AdValid=%d Error class=%d Error " - "code=%d\n", valid, ((sbp[0] >> 4) & 0x7), - (sbp[0] & 0xf)); + r += sg_scnpr(b + r, blen - r, "%s", lip); + r += sg_scnpr(b + r, blen - r, "Probably uninitialized data.\n%s " + "Try to view as SCSI-1 non-extended sense:\n", lip); + r += sg_scnpr(b + r, blen - r, " AdValid=%d Error class=%d Error " + "code=%d\n", valid, ((sbp[0] >> 4) & 0x7), + (sbp[0] & 0xf)); if (valid) - scnpr(b + r, blen - r, "%s lba=0x%x\n", lip, - sg_get_unaligned_be24(sbp + 1) & 0x1fffff); - n += scnpr(cbp + n, cblen - n, "%s\n", b); + sg_scnpr(b + r, blen - r, "%s lba=0x%x\n", lip, + sg_get_unaligned_be24(sbp + 1) & 0x1fffff); + n += sg_scnpr(cbp + n, cblen - n, "%s\n", b); len = sb_len; if (len > 32) len = 32; /* trim in case there is a lot of rubbish */ @@ -1846,21 +1850,22 @@ check_raw: int embed_len; char z[64]; - n += scnpr(cbp + n, cblen - n, "%s Raw sense data (in hex), " - "sb_len=%d", lip, sb_len); + n += sg_scnpr(cbp + n, cblen - n, "%s Raw sense data (in hex), " + "sb_len=%d", lip, sb_len); if (n >= (cblen - 1)) return n; if ((sb_len > 7) && (sbp[0] >= 0x70) && (sbp[0] < 0x74)) { embed_len = sbp[7] + 8; - n += scnpr(cbp + n, cblen - n, ", embedded_len=%d\n", embed_len); + n += sg_scnpr(cbp + n, cblen - n, ", embedded_len=%d\n", + embed_len); } else { embed_len = sb_len; - n += scnpr(cbp + n, cblen - n, "\n"); + n += sg_scnpr(cbp + n, cblen - n, "\n"); } if (n >= (cblen - 1)) return n; - scnpr(z, sizeof(z), "%.50s ", lip); + sg_scnpr(z, sizeof(z), "%.50s ", lip); n += hex2str(sbp, embed_len, z, -1, cblen - n, cbp + n); } return n; @@ -2006,9 +2011,10 @@ sg_get_category_sense_str(int sense_cat, int b_len, char * b, int verbose) if (b_len <= 0) return b; if (! sg_exit2str(sense_cat, (verbose > 0), b_len, b)) { - n = scnpr(b, b_len, "Sense category: %d", sense_cat); + n = sg_scnpr(b, b_len, "Sense category: %d", sense_cat); if ((0 == verbose) && (n < (b_len - 1))) - scnpr(b + n, b_len - n, ", try '-v' option for more information"); + sg_scnpr(b + n, b_len - n, ", try '-v' option for more " + "information"); } return b; /* Note that a valid C string is returned in all cases */ } @@ -2136,7 +2142,7 @@ sg_get_command_name(const uint8_t * cmdp, int peri_type, int buff_len, return; } if (NULL == cmdp) { - scnpr(buff, buff_len, "%s", "<null> command pointer"); + sg_scnpr(buff, buff_len, "%s", "<null> command pointer"); return; } service_action = (SG_VARIABLE_LENGTH_CMD == cmdp[0]) ? @@ -2201,14 +2207,14 @@ sg_get_opcode_sa_name(uint8_t cmd_byte0, int service_action, vnp = get_value_name(osp->arr, service_action, peri_type); if (vnp) { if (osp->prefix) - scnpr(buff, buff_len, "%s, %s", osp->prefix, - vnp->name); + sg_scnpr(buff, buff_len, "%s, %s", osp->prefix, + vnp->name); else - scnpr(buff, buff_len, "%s", vnp->name); + sg_scnpr(buff, buff_len, "%s", vnp->name); } else { sg_get_opcode_name(cmd_byte0, peri_type, sizeof(b), b); - scnpr(buff, buff_len, "%s service action=0x%x", b, - service_action); + sg_scnpr(buff, buff_len, "%s service action=0x%x", b, + service_action); } } else sg_get_opcode_name(cmd_byte0, peri_type, buff_len, buff); @@ -2232,7 +2238,7 @@ sg_get_opcode_name(uint8_t cmd_byte0, int peri_type, int buff_len, return; } if (SG_VARIABLE_LENGTH_CMD == cmd_byte0) { - scnpr(buff, buff_len, "%s", "Variable length"); + sg_scnpr(buff, buff_len, "%s", "Variable length"); return; } grp = (cmd_byte0 >> 5) & 0x7; @@ -2244,19 +2250,19 @@ sg_get_opcode_name(uint8_t cmd_byte0, int peri_type, int buff_len, case 5: vnp = get_value_name(sg_lib_normal_opcodes, cmd_byte0, peri_type); if (vnp) - scnpr(buff, buff_len, "%s", vnp->name); + sg_scnpr(buff, buff_len, "%s", vnp->name); else - scnpr(buff, buff_len, "Opcode=0x%x", (int)cmd_byte0); + sg_scnpr(buff, buff_len, "Opcode=0x%x", (int)cmd_byte0); break; case 3: - scnpr(buff, buff_len, "Reserved [0x%x]", (int)cmd_byte0); + sg_scnpr(buff, buff_len, "Reserved [0x%x]", (int)cmd_byte0); break; case 6: case 7: - scnpr(buff, buff_len, "Vendor specific [0x%x]", (int)cmd_byte0); + sg_scnpr(buff, buff_len, "Vendor specific [0x%x]", (int)cmd_byte0); break; default: - scnpr(buff, buff_len, "Opcode=0x%x", (int)cmd_byte0); + sg_scnpr(buff, buff_len, "Opcode=0x%x", (int)cmd_byte0); break; } } @@ -2393,44 +2399,44 @@ sg_get_sfs_str(uint16_t sfs_code, int peri_type, int buff_len, char * buff, if (sfs_code < 0x100) { /* SPC Feature Sets */ if (vnp) { if (verbose) - n += scnpr(buff, buff_len, "SPC %s", vnp->name); + n += sg_scnpr(buff, buff_len, "SPC %s", vnp->name); else - n += scnpr(buff, buff_len, "%s", vnp->name); + n += sg_scnpr(buff, buff_len, "%s", vnp->name); } else - n += scnpr(buff, buff_len, "%s", sg_sfs_spc_reserved); + n += sg_scnpr(buff, buff_len, "%s", sg_sfs_spc_reserved); } else if (sfs_code < 0x200) { /* SBC Feature Sets */ if (vnp) { if (verbose) - n += scnpr(buff, buff_len, "SBC %s", vnp->name); + n += sg_scnpr(buff, buff_len, "SBC %s", vnp->name); else - n += scnpr(buff, buff_len, "%s", vnp->name); + n += sg_scnpr(buff, buff_len, "%s", vnp->name); } else - n += scnpr(buff, buff_len, "%s", sg_sfs_sbc_reserved); + n += sg_scnpr(buff, buff_len, "%s", sg_sfs_sbc_reserved); } else if (sfs_code < 0x300) { /* SSC Feature Sets */ if (vnp) { if (verbose) - n += scnpr(buff, buff_len, "SSC %s", vnp->name); + n += sg_scnpr(buff, buff_len, "SSC %s", vnp->name); else - n += scnpr(buff, buff_len, "%s", vnp->name); + n += sg_scnpr(buff, buff_len, "%s", vnp->name); } else - n += scnpr(buff, buff_len, "%s", sg_sfs_ssc_reserved); + n += sg_scnpr(buff, buff_len, "%s", sg_sfs_ssc_reserved); } else if (sfs_code < 0x400) { /* ZBC Feature Sets */ if (vnp) { if (verbose) - n += scnpr(buff, buff_len, "ZBC %s", vnp->name); + n += sg_scnpr(buff, buff_len, "ZBC %s", vnp->name); else - n += scnpr(buff, buff_len, "%s", vnp->name); + n += sg_scnpr(buff, buff_len, "%s", vnp->name); } else - n += scnpr(buff, buff_len, "%s", sg_sfs_zbc_reserved); + n += sg_scnpr(buff, buff_len, "%s", sg_sfs_zbc_reserved); } else { /* Other SCSI Feature Sets */ if (vnp) { if (verbose) - n += scnpr(buff, buff_len, "[unrecognized PDT] %s", - vnp->name); + n += sg_scnpr(buff, buff_len, "[unrecognized PDT] %s", + vnp->name); else - n += scnpr(buff, buff_len, "%s", vnp->name); + n += sg_scnpr(buff, buff_len, "%s", vnp->name); } else - n += scnpr(buff, buff_len, "%s", sg_sfs_reserved); + n += sg_scnpr(buff, buff_len, "%s", sg_sfs_reserved); } if (verbose > 4) @@ -2644,7 +2650,7 @@ safe_strerror(int errnum) errstr = strerror(errnum); if (NULL == errstr) { len = strlen(safe_errbuf); - scnpr(safe_errbuf + len, sizeof(safe_errbuf) - len, "%i", errnum); + sg_scnpr(safe_errbuf + len, sizeof(safe_errbuf) - len, "%i", errnum); return safe_errbuf; } return errstr; @@ -2699,7 +2705,7 @@ dStrHexFp(const char* str, int len, int no_ascii, FILE * fp) c = *p++; if (bpos == (bpstart + (8 * 3))) bpos++; - scnpr(&buff[bpos], blen - bpos, "%.2x", (int)(uint8_t)c); + sg_scnpr(&buff[bpos], blen - bpos, "%.2x", (int)(uint8_t)c); buff[bpos + 2] = ' '; if ((k > 0) && (0 == ((k + 1) % 16))) { trimTrailingSpaces(buff); @@ -2717,7 +2723,7 @@ dStrHexFp(const char* str, int len, int no_ascii, FILE * fp) return; } /* no_ascii>=0, start each line with address (offset) */ - k = scnpr(buff + 1, blen - 1, "%.2x", a); + k = sg_scnpr(buff + 1, blen - 1, "%.2x", a); buff[k + 1] = ' '; for (i = 0; i < len; i++) { @@ -2725,7 +2731,7 @@ dStrHexFp(const char* str, int len, int no_ascii, FILE * fp) bpos += 3; if (bpos == (bpstart + (9 * 3))) bpos++; - scnpr(&buff[bpos], blen - bpos, "%.2x", (int)(uint8_t)c); + sg_scnpr(&buff[bpos], blen - bpos, "%.2x", (int)(uint8_t)c); buff[bpos + 2] = ' '; if (no_ascii) buff[cpos++] = ' '; @@ -2742,7 +2748,7 @@ dStrHexFp(const char* str, int len, int no_ascii, FILE * fp) cpos = cpstart; a += 16; memset(buff, ' ', 80); - k = scnpr(buff + 1, blen - 1, "%.2x", a); + k = sg_scnpr(buff + 1, blen - 1, "%.2x", a); buff[k + 1] = ' '; } } @@ -2818,19 +2824,19 @@ dStrHexStr(const char * str, int len, const char * leadin, int format, c = *p++; if (bpos == (bpstart + ((DSHS_BPL / 2) * 3))) bpos++; /* for extra space in middle of each line's hex */ - scnpr(buff + bpos, (int)sizeof(buff) - bpos, "%.2x", - (int)(uint8_t)c); + sg_scnpr(buff + bpos, (int)sizeof(buff) - bpos, "%.2x", + (int)(uint8_t)c); buff[bpos + 2] = ' '; if (want_ascii) a[k % DSHS_BPL] = my_isprint(c) ? c : '.'; if ((k > 0) && (0 == ((k + 1) % DSHS_BPL))) { trimTrailingSpaces(buff); if (want_ascii) { - n += scnpr(b + n, b_len - n, "%-*s %s\n", prior_ascii_len, - buff, a); + n += sg_scnpr(b + n, b_len - n, "%-*s %s\n", + prior_ascii_len, buff, a); memset(a, ' ', DSHS_BPL); } else - n += scnpr(b + n, b_len - n, "%s\n", buff); + n += sg_scnpr(b + n, b_len - n, "%s\n", buff); if (n >= (b_len - 1)) return n; memset(buff, ' ', DSHS_LINE_BLEN); @@ -2843,10 +2849,10 @@ dStrHexStr(const char * str, int len, const char * leadin, int format, if (bpos > bpstart) { trimTrailingSpaces(buff); if (want_ascii) - n += scnpr(b + n, b_len - n, "%-*s %s\n", prior_ascii_len, - buff, a); + n += sg_scnpr(b + n, b_len - n, "%-*s %s\n", prior_ascii_len, + buff, a); else - n += scnpr(b + n, b_len - n, "%s\n", buff); + n += sg_scnpr(b + n, b_len - n, "%s\n", buff); } return n; } @@ -2955,7 +2961,7 @@ dWordHex(const uint16_t* words, int num, int no_ascii, bool swapb) if (swapb) c = swapb_uint16(c); bpos += 5; - scnpr(buff + bpos, blen - bpos, "%.4x", (unsigned int)c); + sg_scnpr(buff + bpos, blen - bpos, "%.4x", (my_uint)c); buff[bpos + 4] = ' '; if ((k > 0) && (0 == ((k + 1) % 8))) { if (-2 == no_ascii) @@ -2975,7 +2981,7 @@ dWordHex(const uint16_t* words, int num, int no_ascii, bool swapb) return; } /* no_ascii>=0, start each line with address (offset) */ - k = scnpr(buff + 1, blen - 1, "%.2x", a); + k = sg_scnpr(buff + 1, blen - 1, "%.2x", a); buff[k + 1] = ' '; for (i = 0; i < num; i++) { @@ -2983,7 +2989,7 @@ dWordHex(const uint16_t* words, int num, int no_ascii, bool swapb) if (swapb) c = swapb_uint16(c); bpos += 5; - scnpr(buff + bpos, blen - bpos, "%.4x", (unsigned int)c); + sg_scnpr(buff + bpos, blen - bpos, "%.4x", (my_uint)c); buff[bpos + 4] = ' '; if (no_ascii) { buff[cpos++] = ' '; @@ -3006,7 +3012,7 @@ dWordHex(const uint16_t* words, int num, int no_ascii, bool swapb) cpos = cpstart; a += 8; memset(buff, ' ', 80); - k = scnpr(buff + 1, blen - 1, "%.2x", a); + k = sg_scnpr(buff + 1, blen - 1, "%.2x", a); buff[k + 1] = ' '; } } |