From d9233e48649e3f8b1664ec4564e424da52513dc5 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 17 Aug 1995 14:43:49 +0000 Subject: [PATCH] ansi changes --- src/db/dbls.c | 254 ++++++++++++++++++++++++------------------------ src/db/taskwd.c | 4 +- 2 files changed, 129 insertions(+), 129 deletions(-) diff --git a/src/db/dbls.c b/src/db/dbls.c index ea97358f2..827dfc345 100644 --- a/src/db/dbls.c +++ b/src/db/dbls.c @@ -318,17 +318,17 @@ DbRecType(fp, fflag) if(!(precType=pdbBase->precType)) return; sprintf(buffer, "\n\ndbls: listing the precType structure\n"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] precType-> recType", &precType, precType); + sprintf(buffer, "%p[%p] precType-> recType", &precType, precType); bufOut(fp, fflag); - sprintf(buffer, "%8x\t number\t [ %d ]\t/* number of types */", + sprintf(buffer, "%p\t number\t [ %d ]\t/* number of types */", &precType->number, precType->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papName\t\t /* pap to record type */", + sprintf(buffer, "%p[%p] **papName\t\t /* pap to record type */", &precType->papName, precType->papName); bufOut(fp, fflag); for (i = 0; i < precType->number; i++) { if (precType->papName[i]) { - sprintf(buffer, "%8x[%8x] papName->[%d]->\t\"%s\"", + sprintf(buffer, "%p[%p] papName->[%d]->\t\"%s\"", &precType->papName[i], precType->papName[i], i, precType->papName[i]); @@ -349,33 +349,33 @@ ChoiceGbl(fp, fflag) } sprintf(buffer, "\n\ndbls: listing the choiceGbl structure\n"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] pchoiceGbl -> arrChoiceSet", &pchoiceGbl, pchoiceGbl); + sprintf(buffer, "%p[%p] pchoiceGbl -> arrChoiceSet", &pchoiceGbl, pchoiceGbl); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t\t[%d]\t/* number of choice sets */", + sprintf(buffer, "%p\t\t number\t\t[%d]\t/* number of choice sets */", &pchoiceGbl->number, pchoiceGbl->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t**papChoiceSet -> choiceSet", + sprintf(buffer, "%p[%p]\t**papChoiceSet -> choiceSet", &pchoiceGbl->papChoiceSet, pchoiceGbl->papChoiceSet); bufOut(fp, fflag); for (i = 0; i < pchoiceGbl->number; i++) { if (pchoiceGbl->papChoiceSet[i]) { - sprintf(buffer, "%8x[%8x]\t papChoiceSet->[%d]\tINDEX[%d]", + sprintf(buffer, "%p[%p]\t papChoiceSet->[%d]\tINDEX[%d]", &pchoiceGbl->papChoiceSet[i], pchoiceGbl->papChoiceSet[i], i, i); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number [%d]\t\t/* number of choices */", + sprintf(buffer, "%p\t\t number [%d]\t\t/* number of choices */", &pchoiceGbl->papChoiceSet[i]->number, pchoiceGbl->papChoiceSet[i]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t **papChoice -> \t\"choice string\"", + sprintf(buffer, "%p[%p]\t **papChoice -> \t\"choice string\"", &pchoiceGbl->papChoiceSet[i]->papChoice, pchoiceGbl->papChoiceSet[i]->papChoice); bufOut(fp, fflag); for (j = 0; j < pchoiceGbl->papChoiceSet[i]->number; j++) { if (pchoiceGbl->papChoiceSet[i]->papChoice[j]) { - sprintf(buffer, "%8x[%8x]\t\t papChoice->[%d]\t\"%s\"", + sprintf(buffer, "%p[%p]\t\t papChoice->[%d]\t\"%s\"", &pchoiceGbl->papChoiceSet[i]->papChoice[j], pchoiceGbl->papChoiceSet[i]->papChoice[j], j, @@ -402,41 +402,41 @@ ChoiceDev(fp, fflag) getRecTypeSel(); sprintf(buffer, "\n\ndbls: listing the choiceDev structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]pchoiceDev-> devChoiceRec ", &pchoiceDev, pchoiceDev); + sprintf(buffer, "%p[%p]pchoiceDev-> devChoiceRec ", &pchoiceDev, pchoiceDev); bufOut(fp, fflag); - sprintf(buffer, "%8x\t number\t[%d]\t\t\t/* number of devChoiceSet */", + sprintf(buffer, "%p\t number\t[%d]\t\t\t/* number of devChoiceSet */", &pchoiceDev->number, pchoiceDev->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papDevChoiceSet -> devChoiceSet ", + sprintf(buffer, "%p[%p] **papDevChoiceSet -> devChoiceSet ", &pchoiceDev->papDevChoiceSet, pchoiceDev->papDevChoiceSet); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (pchoiceDev->papDevChoiceSet[i]) { - sprintf(buffer, "\n%8x[%8x]\tpapDevChoiceSet->[%d]\t\tRECTYPE \"%s\"", + sprintf(buffer, "\n%p[%p]\tpapDevChoiceSet->[%d]\t\tRECTYPE \"%s\"", &pchoiceDev->papDevChoiceSet[i], pchoiceDev->papDevChoiceSet[i], i, precType->papName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t[%d]\t\t/*number of choices */ ", + sprintf(buffer, "%p\t\t number\t[%d]\t\t/*number of choices */ ", &pchoiceDev->papDevChoiceSet[i]->number, pchoiceDev->papDevChoiceSet[i]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t **papDevChoice -> devChoice", + sprintf(buffer, "%p[%p]\t **papDevChoice -> devChoice", &pchoiceDev->papDevChoiceSet[i]->papDevChoice, pchoiceDev->papDevChoiceSet[i]->papDevChoice); bufOut(fp, fflag); for (j = 0; j < pchoiceDev->papDevChoiceSet[i]->number; j++) { if (pchoiceDev->papDevChoiceSet[i]->papDevChoice[j]) { - sprintf(buffer, "%8x[%8x]\t papDevChoice[%d]", + sprintf(buffer, "%p[%p]\t papDevChoice[%d]", &pchoiceDev->papDevChoiceSet[i]->papDevChoice[j], pchoiceDev->papDevChoiceSet[i]->papDevChoice[j], j); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t link_type [%d]", + sprintf(buffer, "%p\t\t link_type [%d]", &pchoiceDev->papDevChoiceSet[i]->papDevChoice[j]->link_type, pchoiceDev->papDevChoiceSet[i]->papDevChoice[j]->link_type); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t\t*pchoice\t\t\"%s\"", + sprintf(buffer, "%p[%p]\t\t*pchoice\t\t\"%s\"", &pchoiceDev->papDevChoiceSet[i]->papDevChoice[j]->pchoice, pchoiceDev->papDevChoiceSet[i]->papDevChoice[j]->pchoice, pchoiceDev->papDevChoiceSet[i]->papDevChoice[j]->pchoice); @@ -459,18 +459,18 @@ ChoiceCvt(fp, fflag) } sprintf(buffer, "\n\ndbls: listing the choiceCvt structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] choiceCvt -> choiceCvt", &pchoiceCvt, pchoiceCvt); + sprintf(buffer, "%p[%p] choiceCvt -> choiceCvt", &pchoiceCvt, pchoiceCvt); bufOut(fp, fflag); - sprintf(buffer, "%8x number\t [ %d ]\t/* number of choices */", + sprintf(buffer, "%p number\t [ %d ]\t/* number of choices */", &pchoiceCvt->number, pchoiceCvt->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papChoice -> \"choice string\"", + sprintf(buffer, "%p[%p] **papChoice -> \"choice string\"", &pchoiceCvt->papChoice, pchoiceCvt->papChoice); bufOut(fp, fflag); for (i = 0; i < pchoiceCvt->number; i++) if (pchoiceCvt->papChoice[i]) { - sprintf(buffer, "%8x[%8x] papChoice[%d]\t\"%s\" ", + sprintf(buffer, "%p[%p] papChoice[%d]\t\"%s\" ", &pchoiceCvt->papChoice[i], pchoiceCvt->papChoice[i], i, pchoiceCvt->papChoice[i]); bufOut(fp, fflag); @@ -523,55 +523,55 @@ CvtTable(fp, fflag) } sprintf(buffer, "\n\ndbls: listing the pcvtTable structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] pcvtTable -> arrBrkTable", &pcvtTable, pcvtTable); + sprintf(buffer, "%p[%p] pcvtTable -> arrBrkTable", &pcvtTable, pcvtTable); bufOut(fp, fflag); - sprintf(buffer, "%8x number\t [ %d ]\t/* number of break tables */", + sprintf(buffer, "%p number\t [ %d ]\t/* number of break tables */", &pcvtTable->number, pcvtTable->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papBrkTable -> brkTable", + sprintf(buffer, "%p[%p] **papBrkTable -> brkTable", &pcvtTable->papBrkTable, pcvtTable->papBrkTable); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (pcvtTable->papBrkTable[i]) { - sprintf(buffer, "%8x[%8x] papBrkTable[%d] ", + sprintf(buffer, "%p[%p] papBrkTable[%d] ", &pcvtTable->papBrkTable[i], pcvtTable->papBrkTable[i], i); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t *name\t\t\t\"%s\"", + sprintf(buffer, "%p[%p]\t *name\t\t\t\"%s\"", &pcvtTable->papBrkTable[i]->name, pcvtTable->papBrkTable[i]->name, pcvtTable->papBrkTable[i]->name); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number [ %d ]\t/* number of brkInt in this table */ ", + sprintf(buffer, "%p\t\t number [ %d ]\t/* number of brkInt in this table */ ", &pcvtTable->papBrkTable[i]->number, pcvtTable->papBrkTable[i]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t rawLow\t\t\t%-d", + sprintf(buffer, "%p\t\t rawLow\t\t\t%-d", &pcvtTable->papBrkTable[i]->rawLow, pcvtTable->papBrkTable[i]->rawLow); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t rawHigh\t\t\t%-d", + sprintf(buffer, "%p\t\t rawHigh\t\t\t%-d", &pcvtTable->papBrkTable[i]->rawHigh, pcvtTable->papBrkTable[i]->rawHigh); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t**papBrkInt", + sprintf(buffer, "%p[%p]\t**papBrkInt", &pcvtTable->papBrkTable[i]->papBrkInt, pcvtTable->papBrkTable[i]->papBrkInt); bufOut(fp, fflag); for (j = 0; j < pcvtTable->papBrkTable[i]->number; j++) { if (pcvtTable->papBrkTable[i]->papBrkInt[j]) { - sprintf(buffer, "%8x[%8x]\t papBrkInt[%d] -> brkInt", + sprintf(buffer, "%p[%p]\t papBrkInt[%d] -> brkInt", &pcvtTable->papBrkTable[i]->papBrkInt[j], pcvtTable->papBrkTable[i]->papBrkInt[j], j); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t raw\t\t\t%-d", + sprintf(buffer, "%p\t\t raw\t\t\t%-d", &pcvtTable->papBrkTable[i]->papBrkInt[j]->raw, pcvtTable->papBrkTable[i]->papBrkInt[j]->raw); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t slope\t\t\t%-.5f", + sprintf(buffer, "%p\t\t slope\t\t\t%-.5f", &pcvtTable->papBrkTable[i]->papBrkInt[j]->slope, pcvtTable->papBrkTable[i]->papBrkInt[j]->slope); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t eng\t\t\t%-.5f", + sprintf(buffer, "%p\t\t eng\t\t\t%-.5f", &pcvtTable->papBrkTable[i]->papBrkInt[j]->eng, pcvtTable->papBrkTable[i]->papBrkInt[j]->eng); bufOut(fp, fflag); @@ -596,42 +596,42 @@ DevSup(fp, fflag) getRecTypeSel(); sprintf(buffer, "\n\ndbls: listing the devSup structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] precDevSup -> recDevSup ", &precDevSup, precDevSup); + sprintf(buffer, "%p[%p] precDevSup -> recDevSup ", &precDevSup, precDevSup); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\tnumber\t [ %d ]\t/* number of record types */", + sprintf(buffer, "%p\t\tnumber\t [ %d ]\t/* number of record types */", &precDevSup->number, precDevSup->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papDevSup -> precDevSup ", + sprintf(buffer, "%p[%p] **papDevSup -> precDevSup ", &precDevSup->papDevSup, precDevSup->papDevSup); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (precDevSup->papDevSup[i]) { - sprintf(buffer, "%8x[%8x] papDevSup->[%d]\t\"%s\"", + sprintf(buffer, "%p[%p] papDevSup->[%d]\t\"%s\"", &precDevSup->papDevSup[i], precDevSup->papDevSup[i], i, precType->papName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t[%d]\t/* number of dset */", + sprintf(buffer, "%p\t\t number\t[%d]\t/* number of dset */", &precDevSup->papDevSup[i]->number, precDevSup->papDevSup[i]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papDsetName", + sprintf(buffer, "%p[%p] **papDsetName", &precDevSup->papDevSup[i]->papDsetName, precDevSup->papDevSup[i]->papDsetName); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papDset", + sprintf(buffer, "%p[%p] **papDset", &precDevSup->papDevSup[i]->papDset, precDevSup->papDevSup[i]->papDset); bufOut(fp, fflag); for (j = 0; j < precDevSup->papDevSup[i]->number; j++) { if (precDevSup->papDevSup[i]->papDsetName[j]) { - sprintf(buffer, "%8x[%8x]\t\tpapDsetName[%d]\t%s", + sprintf(buffer, "%p[%p]\t\tpapDsetName[%d]\t%s", &precDevSup->papDevSup[i]->papDsetName[j], precDevSup->papDevSup[i]->papDsetName[j], j, precDevSup->papDevSup[i]->papDsetName[j]); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t\tpapDset[%d]", + sprintf(buffer, "%p[%p]\t\tpapDset[%d]", &precDevSup->papDevSup[i]->papDset[j], precDevSup->papDevSup[i]->papDset[j], j); bufOut(fp, fflag); @@ -652,24 +652,24 @@ DrvSup(fp, fflag) } sprintf(buffer, "\n\ndbls: listing the drvSup structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] pdrvSup -> pdrvSup ", &pdrvSup, pdrvSup); + sprintf(buffer, "%p[%p] pdrvSup -> pdrvSup ", &pdrvSup, pdrvSup); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t[%d]\t/* number of dset */", &pdrvSup->number, pdrvSup->number); + sprintf(buffer, "%p\t\t number\t[%d]\t/* number of dset */", &pdrvSup->number, pdrvSup->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papDrvName -> \t/* pArr of ptr to papDrvName */ ", + sprintf(buffer, "%p[%p] **papDrvName -> \t/* pArr of ptr to papDrvName */ ", &pdrvSup->papDrvName, pdrvSup->papDrvName); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papDrvet-> drvet \t/* pArr ptr to drvet */", + sprintf(buffer, "%p[%p] **papDrvet-> drvet \t/* pArr ptr to drvet */", &pdrvSup->papDrvet, pdrvSup->papDrvet); bufOut(fp, fflag); for (i = 0; i < pdrvSup->number; i++) { if (pdrvSup->papDrvName[i]) - sprintf(buffer, "%8x[%8x]\t papDrvName->[%d]\t\"%s\"", + sprintf(buffer, "%p[%p]\t papDrvName->[%d]\t\"%s\"", &pdrvSup->papDrvName[i], pdrvSup->papDrvName[i], i, pdrvSup->papDrvName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t papDrvet->[%d] /* reserved ptr to drvet */", + sprintf(buffer, "%p[%p]\t papDrvet->[%d] /* reserved ptr to drvet */", &pdrvSup->papDrvet[i], pdrvSup->papDrvet[i], i); bufOut(fp, fflag); @@ -723,48 +723,48 @@ DbRecDes(fp, fflag) sprintf(buffer, "\n\ndbls: listing the precDes structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] precDes-> recDes", &precDes, precDes); + sprintf(buffer, "%p[%p] precDes-> recDes", &precDes, precDes); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\tnumber [%d] \t/* number of recTypDes */", + sprintf(buffer, "%p\t\tnumber [%d] \t/* number of recTypDes */", &precDes->number, precDes->number); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (precDes->papRecTypDes[i]) { - sprintf(buffer, "\n%8x[%8x] **papRecTypDes-> recTypDes\t\"%s\"", + sprintf(buffer, "\n%p[%p] **papRecTypDes-> recTypDes\t\"%s\"", &precDes->papRecTypDes, precDes->papRecTypDes, precType->papName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t rec_size [%d]", + sprintf(buffer, "%p\t\t rec_size [%d]", &precDes->papRecTypDes[i]->rec_size, precDes->papRecTypDes[i]->rec_size); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t no_fields [%d]", + sprintf(buffer, "%p\t\t no_fields [%d]", &precDes->papRecTypDes[i]->no_fields, precDes->papRecTypDes[i]->no_fields); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t no_prompt [%d]", + sprintf(buffer, "%p\t\t no_prompt [%d]", &precDes->papRecTypDes[i]->no_prompt, precDes->papRecTypDes[i]->no_prompt); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t no_links [%d]", + sprintf(buffer, "%p\t\t no_links [%d]", &precDes->papRecTypDes[i]->no_links, precDes->papRecTypDes[i]->no_links); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t *link_ind", + sprintf(buffer, "%p[%p]\t *link_ind", &precDes->papRecTypDes[i]->link_ind, precDes->papRecTypDes[i]->link_ind); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t *sortFldName", + sprintf(buffer, "%p[%p]\t *sortFldName", &precDes->papRecTypDes[i]->sortFldName, precDes->papRecTypDes[i]->sortFldName); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t *sortFldInd", + sprintf(buffer, "%p[%p]\t *sortFldInd", &precDes->papRecTypDes[i]->sortFldInd, precDes->papRecTypDes[i]->sortFldInd); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t **papFldDes-> fldDes", + sprintf(buffer, "%p[%p]\t **papFldDes-> fldDes", &precDes->papRecTypDes[i]->papFldDes, precDes->papRecTypDes[i]->papFldDes); bufOut(fp, fflag); @@ -773,7 +773,7 @@ DbRecDes(fp, fflag) endNumJ = precDes->papRecTypDes[i]->no_fields; /* expand *link_ind */ for (j = 0; j < precDes->papRecTypDes[i]->no_links; j++) { - sprintf(buffer,"%8x\tlink_ind[%d] offset=[%d]", + sprintf(buffer,"%p\tlink_ind[%d] offset=[%d]", &precDes->papRecTypDes[i]->link_ind[j], j, precDes->papRecTypDes[i]->link_ind[j]); @@ -782,7 +782,7 @@ DbRecDes(fp, fflag) /* expand *sortFldName and *sortFldInd */ ptemp = (char *) precDes->papRecTypDes[i]->sortFldName; for (j = 0; j < precDes->papRecTypDes[i]->no_fields; j++) { - sprintf(buffer,"[%8x] sortFldName[%2d]=%4.4s [%8x] sortFldInd=%2d", + sprintf(buffer,"[%p] sortFldName[%2d]=%4.4s [%p] sortFldInd=%2d", ptemp, j, ptemp, @@ -796,89 +796,89 @@ DbRecDes(fp, fflag) for (j = begNumJ; j < endNumJ; j++) { sprintf(buffer, "\n"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t **papFldDes->fldDes[%d]", + sprintf(buffer, "%p[%p]\t **papFldDes->fldDes[%d]", &precDes->papRecTypDes[i]->papFldDes[j], precDes->papRecTypDes[i]->papFldDes[j], j); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tprompt\t\t\"%s\"", + sprintf(buffer, "%p\t\t\tprompt\t\t\"%s\"", precDes->papRecTypDes[i]->papFldDes[j]->prompt, precDes->papRecTypDes[i]->papFldDes[j]->prompt); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tfldname\t\t\"%4.4s\"", + sprintf(buffer, "%p\t\t\tfldname\t\t\"%4.4s\"", precDes->papRecTypDes[i]->papFldDes[j]->fldname, precDes->papRecTypDes[i]->papFldDes[j]->fldname); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\toffset [%d]", + sprintf(buffer, "%p\t\t\toffset [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->offset, precDes->papRecTypDes[i]->papFldDes[j]->offset); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tsize [%d]", + sprintf(buffer, "%p\t\t\tsize [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->size, precDes->papRecTypDes[i]->papFldDes[j]->size); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tspecial [%d]", + sprintf(buffer, "%p\t\t\tspecial [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->special, precDes->papRecTypDes[i]->papFldDes[j]->special); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tfield_type [%d]", + sprintf(buffer, "%p\t\t\tfield_type [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->field_type, precDes->papRecTypDes[i]->papFldDes[j]->field_type); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tprocess_passive [%d]", + sprintf(buffer, "%p\t\t\tprocess_passive [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->process_passive, precDes->papRecTypDes[i]->papFldDes[j]->process_passive); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tchoice_set [%d]", + sprintf(buffer, "%p\t\t\tchoice_set [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->choice_set, precDes->papRecTypDes[i]->papFldDes[j]->choice_set); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tcvt_type [%d]", + sprintf(buffer, "%p\t\t\tcvt_type [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->cvt_type, precDes->papRecTypDes[i]->papFldDes[j]->cvt_type); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tpromptflag [%d]", + sprintf(buffer, "%p\t\t\tpromptflag [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->promptflag, precDes->papRecTypDes[i]->papFldDes[j]->promptflag); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tlowfl [%d]", + sprintf(buffer, "%p\t\t\tlowfl [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->lowfl, precDes->papRecTypDes[i]->papFldDes[j]->lowfl); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\thighfl [%d]", + sprintf(buffer, "%p\t\t\thighfl [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->highfl, precDes->papRecTypDes[i]->papFldDes[j]->highfl); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tinterest [%d]", + sprintf(buffer, "%p\t\t\tinterest [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->interest, precDes->papRecTypDes[i]->papFldDes[j]->interest); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tas_level [%d]", + sprintf(buffer, "%p\t\t\tas_level [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->as_level, precDes->papRecTypDes[i]->papFldDes[j]->as_level); bufOut(fp, fflag); memcpy((void *) buff, (void *) & precDes->papRecTypDes[i]->papFldDes[j]->initial, 8); - sprintf(buffer, "%8x[%8x][%8x]\tinitial", + sprintf(buffer, "%p[%8x][%8x]\tinitial", &precDes->papRecTypDes[i]->papFldDes[j]->initial, buff[0], buff[1]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\trange1.fldnum [%d]", + sprintf(buffer, "%p\t\t\trange1.fldnum [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->range1.fldnum, precDes->papRecTypDes[i]->papFldDes[j]->range1.fldnum); bufOut(fp, fflag); memcpy((void *) buff, (void *) & precDes->papRecTypDes[i]->papFldDes[j]->range1.value, 8); - sprintf(buffer, "%8x[%8x][%8x]\trange1.value", + sprintf(buffer, "%p[%8x][%8x]\trange1.value", &precDes->papRecTypDes[i]->papFldDes[j]->range1.value, buff[0], buff[1]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\trange2.fldnum [%d]", + sprintf(buffer, "%p\t\t\trange2.fldnum [%d]", &precDes->papRecTypDes[i]->papFldDes[j]->range2.fldnum, precDes->papRecTypDes[i]->papFldDes[j]->range2.fldnum); bufOut(fp, fflag); memcpy((void *) buff, (void *) & precDes->papRecTypDes[i]->papFldDes[j]->range2.value, 8); - sprintf(buffer, "%8x[%8x][%8x]\trange2.value", + sprintf(buffer, "%p[%8x][%8x]\trange2.value", &precDes->papRecTypDes[i]->papFldDes[j]->range2.value, buff[0], buff[1]); bufOut(fp, fflag); @@ -935,48 +935,48 @@ ChoiceRec(fp, fflag) } sprintf(buffer, "\n\ndbls: listing the choiceRec structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] pchoiceRec -> pchoiceRec", &pchoiceRec, pchoiceRec); + sprintf(buffer, "%p[%p] pchoiceRec -> pchoiceRec", &pchoiceRec, pchoiceRec); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\tnumber\t\t[%d]", &pchoiceRec->number, pchoiceRec->number); + sprintf(buffer, "%p\t\tnumber\t\t[%d]", &pchoiceRec->number, pchoiceRec->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t**papArrChoiceSet -> arrChoiceSet", + sprintf(buffer, "%p[%p]\t**papArrChoiceSet -> arrChoiceSet", &pchoiceRec->papArrChoiceSet, pchoiceRec->papArrChoiceSet); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (pchoiceRec->papArrChoiceSet[i]) { - sprintf(buffer, "%8x[%8x]\tpapArrChoiceSet[%d] -> arrChoiceSet\t\tRECTYPE \"%s\"", + sprintf(buffer, "%p[%p]\tpapArrChoiceSet[%d] -> arrChoiceSet\t\tRECTYPE \"%s\"", &pchoiceRec->papArrChoiceSet[i], pchoiceRec->papArrChoiceSet[i], i, precType->papName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t\t[%d]\t/* number of choice sets */", + sprintf(buffer, "%p\t\t number\t\t[%d]\t/* number of choice sets */", &pchoiceRec->papArrChoiceSet[i]->number, pchoiceRec->papArrChoiceSet[i]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t **papChoiceSet", + sprintf(buffer, "%p[%p]\t **papChoiceSet", &pchoiceRec->papArrChoiceSet[i]->papChoiceSet, pchoiceRec->papArrChoiceSet[i]->papChoiceSet); bufOut(fp, fflag); for (j = 0; j < pchoiceRec->papArrChoiceSet[i]->number; j++) { if (pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]) { - sprintf(buffer, "%8x[%8x]\t papChoiceSet[%d] -> choiceSet \t\tINDEX[%d]", + sprintf(buffer, "%p[%p]\t papChoiceSet[%d] -> choiceSet \t\tINDEX[%d]", &pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j], pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j], j, j); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t\tnumber\t\t[%d]\t/* number of choices */ ", + sprintf(buffer, "%p\t\t\tnumber\t\t[%d]\t/* number of choices */ ", &pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->number, pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t\t**papChoice -> \"string\"", + sprintf(buffer, "%p[%p]\t\t**papChoice -> \"string\"", &pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->papChoice, pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->papChoice); bufOut(fp, fflag); for (k = 0; k < pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->number; k++) { if (pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->papChoice[k]) { - sprintf(buffer, "%8x[%8x]\t\tpapChoice[%d]\t\"%s\"", + sprintf(buffer, "%p[%p]\t\tpapChoice[%d]\t\"%s\"", &pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->papChoice[k], pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->papChoice[k], k, pchoiceRec->papArrChoiceSet[i]->papChoiceSet[j]->papChoice[k]); @@ -1003,28 +1003,28 @@ DbErrDes(fp, fflag) } sprintf(buffer, "\n\ndbls: listing the dbErrDes structure"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] dbErrDes -> errDes ", &dbErrDes, dbErrDes); + sprintf(buffer, "%p[%p] dbErrDes -> errDes ", &dbErrDes, dbErrDes); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\tnumber\t [ %d ]\t /* dim of err modules */", + sprintf(buffer, "%p\t\tnumber\t [ %d ]\t /* dim of err modules */", &dbErrDes->number, dbErrDes->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papErrSet -> errSet ", + sprintf(buffer, "%p[%p] **papErrSet -> errSet ", &dbErrDes->papErrSet, dbErrDes->papErrSet); bufOut(fp, fflag); for (i = 0; i < dbErrDes->number; i++) { if (dbErrDes->papErrSet[i]) { - sprintf(buffer, "%8x[%8x] papErrSet->[%d]\tmodule[%d]", + sprintf(buffer, "%p[%p] papErrSet->[%d]\tmodule[%d]", &dbErrDes->papErrSet[i], dbErrDes->papErrSet[i], i, i + 501); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t[%d]\t/* dim of errSet */", + sprintf(buffer, "%p\t\t number\t[%d]\t/* dim of errSet */", &dbErrDes->papErrSet[i]->number, dbErrDes->papErrSet[i]->number); bufOut(fp, fflag); for (j = 0; j < dbErrDes->papErrSet[i]->number; j++) { if (dbErrDes->papErrSet[i]->papName[j]) { - sprintf(buffer, "%8x[%8x]\t\tpapName[%d]\t\"%s\"", + sprintf(buffer, "%p[%p]\t\tpapName[%d]\t\"%s\"", &dbErrDes->papErrSet[i]->papName[j], dbErrDes->papErrSet[i]->papName[j], j, @@ -1055,30 +1055,30 @@ DbRecords(fp, fflag) getRecTypeSel(); sprintf(buffer, "\n\ndbls: listing the precHeader structure\n"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] precHeader -> recHeader", &precHeader, precHeader); + sprintf(buffer, "%p[%p] precHeader -> recHeader", &precHeader, precHeader); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t\t[%d]\t/* number of record types */", + sprintf(buffer, "%p\t\t number\t\t[%d]\t/* number of record types */", &precHeader->number, precHeader->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t**papRecLoc -> recLoc", + sprintf(buffer, "%p[%p]\t**papRecLoc -> recLoc", &precHeader->papRecLoc, precHeader->papRecLoc); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (precHeader->papRecLoc[i]) { - sprintf(buffer, "%8x[%8x]\t papRecLoc->[%d]\tRECTYPE[\"%s\"]", + sprintf(buffer, "%p[%p]\t papRecLoc->[%d]\tRECTYPE[\"%s\"]", &precHeader->papRecLoc[i], precHeader->papRecLoc[i], i, precType->papName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t rec_size [%d]\t\t/* rec_size in bytes */", + sprintf(buffer, "%p\t\t rec_size [%d]\t\t/* rec_size in bytes */", &precHeader->papRecLoc[i]->rec_size, precHeader->papRecLoc[i]->rec_size); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t record_type [%d]\t\t/* record_type in bytes */", + sprintf(buffer, "%p\t\t record_type [%d]\t\t/* record_type in bytes */", &precHeader->papRecLoc[i]->record_type, precHeader->papRecLoc[i]->record_type); bufOut(fp, fflag); @@ -1102,84 +1102,84 @@ RecSup(fp, fflag) getRecTypeSel(); sprintf(buffer, "\n\ndbls: listing the recSup structure\n"); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] precSup -> precSup", &precSup, precSup); + sprintf(buffer, "%p[%p] precSup -> precSup", &precSup, precSup); bufOut(fp, fflag); - sprintf(buffer, "%8x\t\t number\t\t[%d]\t/* number of record types */", + sprintf(buffer, "%p\t\t number\t\t[%d]\t/* number of record types */", &precSup->number, precSup->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x] **papRset -> rset", + sprintf(buffer, "%p[%p] **papRset -> rset", &precSup->papRset, precSup->papRset); bufOut(fp, fflag); for (i = begNumI; i < endNumI; i++) { if (precSup->papRset[i]) { - sprintf(buffer, "%8x[%8x]\t papRset->[%d]\t\tRECTYPE[\"%s\"]", + sprintf(buffer, "%p[%p]\t papRset->[%d]\t\tRECTYPE[\"%s\"]", &precSup->papRset[i], precSup->papRset[i], i, precType->papName[i]); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t number\t\t/*number of support routines */", + sprintf(buffer, "%p[%d]\t number\t\t/*number of support routines */", &precSup->papRset[i]->number, precSup->papRset[i]->number); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t report\t\t/*print report */", + sprintf(buffer, "%p[%p]\t report\t\t/*print report */", &precSup->papRset[i]->report, precSup->papRset[i]->report); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t init\t\t/*init support */", + sprintf(buffer, "%p[%p]\t init\t\t/*init support */", &precSup->papRset[i]->init, precSup->papRset[i]->init); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t init_record\t/*init record */", + sprintf(buffer, "%p[%p]\t init_record\t/*init record */", &precSup->papRset[i]->init_record, precSup->papRset[i]->init_record); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t process\t\t/*process record */", + sprintf(buffer, "%p[%p]\t process\t\t/*process record */", &precSup->papRset[i]->process, precSup->papRset[i]->process); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t special\t\t/*special processing */", + sprintf(buffer, "%p[%p]\t special\t\t/*special processing */", &precSup->papRset[i]->special, precSup->papRset[i]->special); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_precision\t/* get_precision of this type */", + sprintf(buffer, "%p[%p]\t get_precision\t/* get_precision of this type */", &precSup->papRset[i]->get_precision, precSup->papRset[i]->get_precision); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_value\t\t/*get value field */", + sprintf(buffer, "%p[%p]\t get_value\t\t/*get value field */", &precSup->papRset[i]->get_value, precSup->papRset[i]->get_value); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t cvt_dbaddr\t\t/*cvt dbAddr */", + sprintf(buffer, "%p[%p]\t cvt_dbaddr\t\t/*cvt dbAddr */", &precSup->papRset[i]->cvt_dbaddr, precSup->papRset[i]->cvt_dbaddr); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_array_info\t/* get_array_info of this type */", + sprintf(buffer, "%p[%p]\t get_array_info\t/* get_array_info of this type */", &precSup->papRset[i]->get_array_info, precSup->papRset[i]->get_array_info); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t put_array_info\t/* put_array_info of this type */", + sprintf(buffer, "%p[%p]\t put_array_info\t/* put_array_info of this type */", &precSup->papRset[i]->put_array_info, precSup->papRset[i]->put_array_info); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_enum_str\t/*get string from enum item*/", + sprintf(buffer, "%p[%p]\t get_enum_str\t/*get string from enum item*/", &precSup->papRset[i]->get_enum_str, precSup->papRset[i]->get_enum_str); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_units \t\t/* get_units of this type */", + sprintf(buffer, "%p[%p]\t get_units \t\t/* get_units of this type */", &precSup->papRset[i]->get_units, precSup->papRset[i]->get_units); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_graphic_double /* get_graphic_double of this type */", + sprintf(buffer, "%p[%p]\t get_graphic_double /* get_graphic_double of this type */", &precSup->papRset[i]->get_graphic_double, precSup->papRset[i]->get_graphic_double); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_control_double /* get_control_double of this type */", + sprintf(buffer, "%p[%p]\t get_control_double /* get_control_double of this type */", &precSup->papRset[i]->get_control_double, precSup->papRset[i]->get_control_double); bufOut(fp, fflag); - sprintf(buffer, "%8x[%8x]\t get_enum_strs\t/*get all enum strings */", + sprintf(buffer, "%p[%p]\t get_enum_strs\t/*get all enum strings */", &precSup->papRset[i]->get_enum_strs, precSup->papRset[i]->get_enum_strs); bufOut(fp, fflag); diff --git a/src/db/taskwd.c b/src/db/taskwd.c index a663296c5..c30ba9ecb 100644 --- a/src/db/taskwd.c +++ b/src/db/taskwd.c @@ -166,7 +166,7 @@ static void taskwdTask(void) pname = taskName(pt->id.tid); if(!pt->suspended) { - struct task_list *ptany,*anynext; + struct task_list *ptany; pt->suspended = TRUE; sprintf(message,"task %x %s suspended",pt->id.tid,pname); @@ -205,7 +205,7 @@ static struct task_list *allocList(void) FASTLOCK(&alloclock); if(freeHead) { - (void *)pt = (void *)freeHead; + pt = (struct task_list *)freeHead; freeHead = freeHead->next; } else pt = calloc(1,sizeof(struct task_list)); if(pt==NULL) {