- Removed -fwritable-string

This commit is contained in:
koennecke
2006-03-31 15:25:04 +00:00
parent c7794e1029
commit 78c0e46935
11 changed files with 45 additions and 37 deletions

View File

@@ -869,7 +869,7 @@ static int TcpAsMotHalt(void *pData){
/* host name */
pPtr = Tcl_GetVar2(pTcl,name,"Host",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"Host",TCL_GLOBAL_ONLY);
if(!pPtr)
{
Tcl_AppendResult(pTcl,"ERROR: no hostname found in",name,NULL);
@@ -879,7 +879,7 @@ static int TcpAsMotHalt(void *pData){
strncpy(host,pPtr,131);
/* port number */
pPtr = Tcl_GetVar2(pTcl,name,"Port",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"Port",TCL_GLOBAL_ONLY);
if(!pPtr)
{
Tcl_AppendResult(pTcl,"ERROR: no port number found in",name,NULL);
@@ -904,13 +904,13 @@ static int TcpAsMotHalt(void *pData){
/*
username and password
*/
pPtr = Tcl_GetVar2(pTcl,name,"User",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"User",TCL_GLOBAL_ONLY);
if(!pPtr){
strncpy(pDorn->user,"NVS",131);
} else {
strncpy(pDorn->user,pPtr,131);
}
pPtr = Tcl_GetVar2(pTcl,name,"Password",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"Password",TCL_GLOBAL_ONLY);
if(!pPtr){
strncpy(pDorn->pword,"NVS",131);
} else {
@@ -918,7 +918,7 @@ static int TcpAsMotHalt(void *pData){
}
/* time out. This one gets defaulted when not specified */
pPtr = Tcl_GetVar2(pTcl,name,"Timeout",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"Timeout",TCL_GLOBAL_ONLY);
if(!pPtr)
{
pDorn->timeout = 5;
@@ -932,7 +932,7 @@ static int TcpAsMotHalt(void *pData){
}
}
pPtr = Tcl_GetVar2(pTcl,name,"Debug",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"Debug",TCL_GLOBAL_ONLY);
if(pPtr != NULL)
{
setRS232Debug(pDorn->controller, 10);
@@ -964,7 +964,7 @@ static int TcpAsMotHalt(void *pData){
pNew->Init = TcpDornierInit;
/* tolerance This one gets defaulted when not specified */
pPtr = Tcl_GetVar2(pTcl,name,"Tolerance",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pTcl,name,"Tolerance",TCL_GLOBAL_ONLY);
if(!pPtr)
{
pNew->fTolerance = 10.;
@@ -1055,7 +1055,8 @@ int VelSelTcpFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
/*
now initialize additional parameters for the motor
*/
pPtr = Tcl_GetVar2(pSics->pTcl,argv[2],"TiltTolerance",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pSics->pTcl,argv[2],"TiltTolerance",
TCL_GLOBAL_ONLY);
pAstDriv->fTolerance = .1;
if(pPtr != NULL){
iRet = Tcl_GetDouble(pSics->pTcl,pPtr,&d);
@@ -1065,7 +1066,7 @@ int VelSelTcpFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
}
limit = 10.;
pPtr = Tcl_GetVar2(pSics->pTcl,argv[2],"TiltUpper",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pSics->pTcl,argv[2],"TiltUpper",TCL_GLOBAL_ONLY);
if(pPtr != NULL){
iRet = Tcl_GetDouble(pSics->pTcl,pPtr,&d);
if(iRet == TCL_OK){
@@ -1075,7 +1076,7 @@ int VelSelTcpFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
pAstDriv->fUpper = limit;
MotorSetPar(pTilt,pCon,"softupperlim",limit);
pPtr = Tcl_GetVar2(pSics->pTcl,argv[2],"TiltLower",TCL_GLOBAL_ONLY);
pPtr = (char *)Tcl_GetVar2(pSics->pTcl,argv[2],"TiltLower",TCL_GLOBAL_ONLY);
limit = -10.;
if(pPtr != NULL){
iRet = Tcl_GetDouble(pSics->pTcl,pPtr,&d);