Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
@@ -175,7 +175,6 @@ tryagain:
|
||||
/*
|
||||
first tell the remote server to backup
|
||||
*/
|
||||
SetStatusFixed(eBatch);
|
||||
strcpy(pBueffel, "transact syncbackup");
|
||||
if (syncFile != NULL) {
|
||||
strcat(pBueffel, " ");
|
||||
@@ -187,7 +186,6 @@ tryagain:
|
||||
NETClosePort(connection);
|
||||
free(connection);
|
||||
connection = NULL;
|
||||
ClearFixedStatus(eEager);
|
||||
if (try > 0)
|
||||
goto tryagain;
|
||||
SCWrite(pCon, "ERROR: Failed to contact main SICS server", eError);
|
||||
@@ -207,7 +205,6 @@ tryagain:
|
||||
NETClosePort(connection);
|
||||
free(connection);
|
||||
connection = NULL;
|
||||
ClearFixedStatus(eEager);
|
||||
pServ->simMode = 1;
|
||||
if (try > 0)
|
||||
goto tryagain;
|
||||
@@ -247,7 +244,6 @@ tryagain:
|
||||
internalCon = SCCreateDummyConnection(pSics);
|
||||
if (internalCon == NULL) {
|
||||
SCWrite(pCon, "ERROR: out of memory in sync", eError);
|
||||
ClearFixedStatus(eEager);
|
||||
return 0;
|
||||
|
||||
}
|
||||
@@ -258,7 +254,6 @@ tryagain:
|
||||
}
|
||||
test = InterpExecute(pSics, internalCon, pBueffel);
|
||||
SCDeleteConnection(internalCon);
|
||||
ClearFixedStatus(eEager);
|
||||
if (test != 1) {
|
||||
SCWrite(pCon, "ERROR: Failed to read sync information", eError);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user