diff --git a/src/dev/gpibDev/devCommonGpib.c b/src/dev/gpibDev/devCommonGpib.c index b47096cb2..cb67d1591 100644 --- a/src/dev/gpibDev/devCommonGpib.c +++ b/src/dev/gpibDev/devCommonGpib.c @@ -3,6 +3,9 @@ /* * $Log$ + * Revision 1.1 1998/01/21 20:46:55 mrk + * restructure; new Symb support + * * Revision 1.36 1998/01/20 22:08:59 mrk * cleanup includes * @@ -1441,13 +1444,16 @@ struct gpibDpvt *pdpvt; else /* interpret msg with predefined format and write into .val */ { /* scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg,pCmd->format,&value)) + if(sscanf(pdpvt->msg,pCmd->format,&value)==1) { pai->val = value; pai->udf = FALSE; } else /* sscanf did not find or assign the parameter */ { + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pai->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pai,READ_ALARM,VALID_ALARM); } } @@ -1603,13 +1609,16 @@ struct gpibDpvt *pdpvt; else /* interpret msg with predefined format and write into .val */ { /* scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg,pCmd->format,&value)) + if(sscanf(pdpvt->msg,pCmd->format,&value)==1) { pli->val = value; pli->udf = FALSE; } else /* sscanf did not find or assign the parameter */ { + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pli->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pli,READ_ALARM,VALID_ALARM); } } @@ -1766,10 +1775,14 @@ struct gpibDpvt *pdpvt; } else { /* Scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg,pCmd->format, &value)) + if(sscanf(pdpvt->msg,pCmd->format, &value)==1) { pbi->rval = value; - else /* sscanf did not find or assign the parameter */ + } else { /* sscanf did not find or assign the parameter */ + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pbi->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pbi,READ_ALARM,VALID_ALARM); + } } } RegisterProcessCallback(&pdpvt->head.callback, priorityLow, pdpvt); @@ -1927,10 +1940,14 @@ struct gpibDpvt *pdpvt; } else { /* Scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg, pCmd->format, &value)) + if(sscanf(pdpvt->msg,pCmd->format, &value)==1) { pmbbi->rval = value; - else /* sscanf did not find or assign the parameter */ + } else { /* sscanf did not find or assign the parameter */ + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pmbbi->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pmbbi,READ_ALARM,VALID_ALARM); + } } } RegisterProcessCallback(&pdpvt->head.callback, priorityLow, pdpvt); diff --git a/src/vxWorks/dev/gpibDev/devCommonGpib.c b/src/vxWorks/dev/gpibDev/devCommonGpib.c index b47096cb2..cb67d1591 100644 --- a/src/vxWorks/dev/gpibDev/devCommonGpib.c +++ b/src/vxWorks/dev/gpibDev/devCommonGpib.c @@ -3,6 +3,9 @@ /* * $Log$ + * Revision 1.1 1998/01/21 20:46:55 mrk + * restructure; new Symb support + * * Revision 1.36 1998/01/20 22:08:59 mrk * cleanup includes * @@ -1441,13 +1444,16 @@ struct gpibDpvt *pdpvt; else /* interpret msg with predefined format and write into .val */ { /* scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg,pCmd->format,&value)) + if(sscanf(pdpvt->msg,pCmd->format,&value)==1) { pai->val = value; pai->udf = FALSE; } else /* sscanf did not find or assign the parameter */ { + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pai->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pai,READ_ALARM,VALID_ALARM); } } @@ -1603,13 +1609,16 @@ struct gpibDpvt *pdpvt; else /* interpret msg with predefined format and write into .val */ { /* scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg,pCmd->format,&value)) + if(sscanf(pdpvt->msg,pCmd->format,&value)==1) { pli->val = value; pli->udf = FALSE; } else /* sscanf did not find or assign the parameter */ { + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pli->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pli,READ_ALARM,VALID_ALARM); } } @@ -1766,10 +1775,14 @@ struct gpibDpvt *pdpvt; } else { /* Scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg,pCmd->format, &value)) + if(sscanf(pdpvt->msg,pCmd->format, &value)==1) { pbi->rval = value; - else /* sscanf did not find or assign the parameter */ + } else { /* sscanf did not find or assign the parameter */ + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pbi->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pbi,READ_ALARM,VALID_ALARM); + } } } RegisterProcessCallback(&pdpvt->head.callback, priorityLow, pdpvt); @@ -1927,10 +1940,14 @@ struct gpibDpvt *pdpvt; } else { /* Scan response string, return value will be 1 if successful */ - if(sscanf(pdpvt->msg, pCmd->format, &value)) + if(sscanf(pdpvt->msg,pCmd->format, &value)==1) { pmbbi->rval = value; - else /* sscanf did not find or assign the parameter */ + } else { /* sscanf did not find or assign the parameter */ + if(ibSrqDebug) + printf("error %s msg %s lenmsg %d\n", + pmbbi->name,pdpvt->msg,strlen(pdpvt->msg)); devGpibLib_setPvSevr(pmbbi,READ_ALARM,VALID_ALARM); + } } } RegisterProcessCallback(&pdpvt->head.callback, priorityLow, pdpvt);