lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Fixed logic problem in ReadXPSSocket; minor changes to avoid compiler warnings

Browse Source
This commit is contained in:
MarkRivers
2012-12-06 22:16:32 +00:00
parent 837c6a0e33
commit ed356764b9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/asynOctetSocket.cpp
+11 -11
View File
@@ -129,11 +129,11 @@ void SendAndReceive (int SocketIndex, char buffer[], char valueRtrn[], int retur
int status;
int retries;
int errStat;
int nread;
size_t nread;
/* Check to see if the Socket is valid! */
bufferLength = strlen(buffer);
bufferLength = (int)strlen(buffer);
if ((SocketIndex < 0) || (SocketIndex >= nextSocket)) {
printf("SendAndReceive: invalid SocketIndex %d\n", SocketIndex);
strcpy(valueRtrn,"-22");
@@ -179,7 +179,7 @@ void SendAndReceive (int SocketIndex, char buffer[], char valueRtrn[], int retur
&eomReason);
asynPrint(psock->pasynUser, ASYN_TRACEIO_DRIVER,
"SendAndReceive, received: nread=%d, returnSize-nread=%d, nbytesIn=%d\n",
nread, returnSize-nread, nbytesIn);
(int)nread, returnSize-nread, (int)nbytesIn);
nread += nbytesIn;
}
} else {
@@ -234,7 +234,7 @@ int ReadXPSSocket (int SocketIndex, char valueRtrn[], int returnSize, double tim
int eomReason;
socketStruct *psock;
int status;
int nread=0;
size_t nread=0;
/* Check to see if the Socket is valid! */
if ((SocketIndex < 0) || (SocketIndex >= nextSocket)) {
@@ -250,8 +250,7 @@ int ReadXPSSocket (int SocketIndex, char valueRtrn[], int returnSize, double tim
}
/* Loop until we the response contains ",EndOfAPI" or we get an error */
while ((status==asynSuccess) &&
(strcmp(valueRtrn + nread - strlen(XPS_TERMINATOR), XPS_TERMINATOR) != 0)) {
do {
status = pasynOctetSyncIO->read(psock->pasynUser,
&valueRtrn[nread],
returnSize-nread,
@@ -259,11 +258,12 @@ int ReadXPSSocket (int SocketIndex, char valueRtrn[], int returnSize, double tim
&nbytesIn,
&eomReason);
asynPrint(psock->pasynUser, ASYN_TRACEIO_DRIVER,
"SendAndReceive, received: nread=%d, returnSize-nread=%d, nbytesIn=%d\n",
nread, returnSize-nread, nbytesIn);
"ReadXPSSocket, received: nread=%d, returnSize-nread=%d, nbytesIn=%d\n",
(int)nread, returnSize-nread, (int)nbytesIn);
nread += nbytesIn;
}
return nread;
} while ((status==asynSuccess) &&
(strcmp(valueRtrn + nread - strlen(XPS_TERMINATOR), XPS_TERMINATOR) != 0));
return (int)nread;
}
@@ -305,7 +305,7 @@ char * GetError(int SocketIndex)
{
if ((SocketIndex < 0) || (SocketIndex >= nextSocket)) {
printf("GetError: invalid SocketIndex %d\n", SocketIndex);
return "Invalid socket";
return (char *)"Invalid socket";
}
return socketStructs[SocketIndex].errorString;
}