Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Conflicts:
	fourmess.c
This commit is contained in:
2016-01-29 08:53:00 +01:00
50 changed files with 183 additions and 201 deletions

View File

@@ -2603,7 +2603,7 @@ static int ZipGetHdbNode(SConnection * pCon, SicsInterp * pSics,
{
pHdb targetNode = NULL;
char error[512], oriPath[512];
int status;
int status = 0;
hdbValue newValue;
pDynString parData = NULL, result= NULL;
Protocol protocol = normal_protocol;
@@ -2651,7 +2651,7 @@ static int ZipReadHdbNode(SConnection * pCon, SicsInterp * pSics,
{
pHdb targetNode = NULL;
char error[512], oriPath[512];
int status;
int status = 0;
pDynString parData = NULL, result= NULL;
Protocol protocol = normal_protocol;
OutCode outCode;