d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix completely stupid and idiotiuc sprintfs in isp_inline.h with

Browse Source 
with the STRNCAT function.
This commit is contained in:
Matt Jacob 2000-07-04 01:06:23 +00:00
parent f6e75de230
commit 8bdda719ae
1 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sys/dev/isp/isp_inline.h
View File

@ -44,71 +44,54 @@ static INLINE void
isp_prtstst(sp) isp_prtstst(sp)
ispstatusreq_t *sp; ispstatusreq_t *sp;
{ {
char buf[172], *p = buf; char buf[172];
sprintf(p, "states->"); buf[0] = 0;
STRNCAT(buf, "states=>", sizeof buf);
if (sp->req_state_flags & RQSF_GOT_BUS) { if (sp->req_state_flags & RQSF_GOT_BUS) {
p += strlen(p); STRNCAT(buf, " GOT_BUS", sizeof buf);
sprintf(p, "%s%s", buf, "GOT_BUS ");
} }
if (sp->req_state_flags & RQSF_GOT_TARGET) { if (sp->req_state_flags & RQSF_GOT_TARGET) {
p += strlen(p); STRNCAT(buf, " GOT_TGT", sizeof buf);
sprintf(p, "%s%s", buf, "GOT_TGT ");
} }
if (sp->req_state_flags & RQSF_SENT_CDB) { if (sp->req_state_flags & RQSF_SENT_CDB) {
p += strlen(p); STRNCAT(buf, " SENT_CDB", sizeof buf);
sprintf(p, "%s%s", buf, "SENT_CDB ");
} }
if (sp->req_state_flags & RQSF_XFRD_DATA) { if (sp->req_state_flags & RQSF_XFRD_DATA) {
p += strlen(p); STRNCAT(buf, " XFRD_DATA", sizeof buf);
sprintf(p, "%s%s", buf, "XFRD_DATA ");
} }
if (sp->req_state_flags & RQSF_GOT_STATUS) { if (sp->req_state_flags & RQSF_GOT_STATUS) {
p += strlen(p); STRNCAT(buf, " GOT_STS", sizeof buf);
sprintf(p, "%s%s", buf, "GOT_STS ");
} }
if (sp->req_state_flags & RQSF_GOT_SENSE) { if (sp->req_state_flags & RQSF_GOT_SENSE) {
p += strlen(p); STRNCAT(buf, " GOT_SNS", sizeof buf);
sprintf(p, "%s%s", buf, "GOT_SNS ");
} }
if (sp->req_state_flags & RQSF_XFER_COMPLETE) { if (sp->req_state_flags & RQSF_XFER_COMPLETE) {
p += strlen(p); STRNCAT(buf, " XFR_CMPLT", sizeof buf);
sprintf(p, "%s%s", buf, "XFR_CMPLT ");
} }
p += strlen(p); STRNCAT(buf, "\nstatus=>", sizeof buf);
sprintf(p, "%s%s", buf, "\n");
p += strlen(p);
sprintf(p, "%s%s", buf, "status->");
if (sp->req_status_flags & RQSTF_DISCONNECT) { if (sp->req_status_flags & RQSTF_DISCONNECT) {
p += strlen(p); STRNCAT(buf, " Disconnect", sizeof buf);
sprintf(p, "%s%s", buf, "Disconnect ");
} }
if (sp->req_status_flags & RQSTF_SYNCHRONOUS) { if (sp->req_status_flags & RQSTF_SYNCHRONOUS) {
p += strlen(p); STRNCAT(buf, " Sync_xfr", sizeof buf);
sprintf(p, "%s%s", buf, "Sync_xfr ");
} }
if (sp->req_status_flags & RQSTF_PARITY_ERROR) { if (sp->req_status_flags & RQSTF_PARITY_ERROR) {
p += strlen(p); STRNCAT(buf, " Parity", sizeof buf);
sprintf(p, "%s%s", buf, "Parity ");
} }
if (sp->req_status_flags & RQSTF_BUS_RESET) { if (sp->req_status_flags & RQSTF_BUS_RESET) {
p += strlen(p); STRNCAT(buf, " Bus_Reset", sizeof buf);
sprintf(p, "%s%s", buf, "Bus_Reset ");
} }
if (sp->req_status_flags & RQSTF_DEVICE_RESET) { if (sp->req_status_flags & RQSTF_DEVICE_RESET) {
p += strlen(p); STRNCAT(buf, " Device_Reset", sizeof buf);
sprintf(p, "%s%s", buf, "Device_Reset ");
} }
if (sp->req_status_flags & RQSTF_ABORTED) { if (sp->req_status_flags & RQSTF_ABORTED) {
p += strlen(p); STRNCAT(buf, " Aborted", sizeof buf);
sprintf(p, "%s%s", buf, "Aborted ");
} }
if (sp->req_status_flags & RQSTF_TIMEOUT) { if (sp->req_status_flags & RQSTF_TIMEOUT) {
p += strlen(p); STRNCAT(buf, " Timeout", sizeof buf);
sprintf(p, "%s%s", buf, "Timeout ");
} }
if (sp->req_status_flags & RQSTF_NEGOTIATION) { if (sp->req_status_flags & RQSTF_NEGOTIATION) {
p += strlen(p); STRNCAT(buf, " Negotiation", sizeof buf);
sprintf(p, "%s%s", buf, "Negotiation ");
} }
PRINTF(buf, "%s\n", buf); PRINTF(buf, "%s\n", buf);
} }