Minor changes to avoid compiler warnings

This commit is contained in:
MarkRivers
2012-12-06 22:20:48 +00:00
parent 44e5cb2eff
commit db3471cbcd
4 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -147,14 +147,14 @@ static RTN_STATUS ESP300_end_trans(struct motorRecord *mr)
struct motor_trans *trans = (struct motor_trans *) mr->dpvt;
struct mess_node *motor_call;
char *msgptr;
int last;
size_t last;
/* Remove trailing ';'s from message. */
motor_call = &(trans->motor_call);
msgptr = motor_call->message;
last = strlen(msgptr) - 1;
if (msgptr[last] == ';')
msgptr[last] = (char) NULL;
msgptr[last] = (char) NULL;
return(motor_end_trans_com(mr, drvtabptr));
}
@@ -169,7 +169,7 @@ static RTN_STATUS ESP300_build_trans(motor_cmnd command, double *parms, struct m
struct MMcontroller *cntrl;
char buff[80];
int axis, card;
unsigned int size;
size_t size;
double dval, cntrl_units;
RTN_STATUS rtnval;
+3 -3
View File
@@ -147,14 +147,14 @@ STATIC RTN_STATUS MM3000_end_trans(struct motorRecord *mr)
struct motor_trans *trans = (struct motor_trans *) mr->dpvt;
struct mess_node *motor_call;
char *msgptr;
int last;
size_t last;
/* Remove trailing ';'s from message. */
motor_call = &(trans->motor_call);
msgptr = motor_call->message;
last = strlen(msgptr) - 1;
if (msgptr[last] == ';')
msgptr[last] = (char) NULL;
msgptr[last] = (char) NULL;
return(motor_end_trans_com(mr, drvtabptr));
}
@@ -169,7 +169,7 @@ STATIC RTN_STATUS MM3000_build_trans(motor_cmnd command, double *parms, struct m
struct MMcontroller *cntrl;
char buff[30];
int axis, card;
unsigned int size;
size_t size;
int intval;
RTN_STATUS rtnval;
+4 -4
View File
@@ -364,7 +364,7 @@ exit:
static RTN_STATUS send_mess(int card, char const *com, char *name)
{
struct MMcontroller *cntrl;
int size;
size_t size;
size_t nwrite;
size = strlen(com);
@@ -496,7 +496,7 @@ static int recv_mess(int card, char *com, int flag)
}
Debug(2, "recv_mess(): message = \"%s\"\n", com);
return(nread);
return((int)nread);
}
@@ -607,11 +607,11 @@ static int motor_init()
}
success_rtn = pasynOctetSyncIO->setOutputEos(cntrl->pasynUser,
output_terminator, strlen(output_terminator));
output_terminator, (int)strlen(output_terminator));
/* Ignore output EOS error in case this is a GPIB port. */
success_rtn = pasynOctetSyncIO->setInputEos(cntrl->pasynUser,
input_terminator, strlen(input_terminator));
input_terminator, (int)strlen(input_terminator));
if (success_rtn != asynSuccess)
{
errlogPrintf("%s setInputEos error = %d\n", errmsg, (int) success_rtn);
+2 -2
View File
@@ -392,7 +392,7 @@ exit:
STATIC RTN_STATUS send_mess(int card, char const *com, char *name)
{
struct MMcontroller *cntrl;
int size;
size_t size;
size_t nwrite;
size = strlen(com);
@@ -522,7 +522,7 @@ STATIC int recv_mess(int card, char *com, int flag)
}
Debug(2, "recv_mess(): message = \"%s\"\n", com);
return(nread);
return((int)nread);
}