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

Conflicts: fourmess.c
2016-01-29 08:53:00 +01:00
parent a630a30294 5e597e2d10
commit 95988f331c
50 changed files with 183 additions and 201 deletions
--- a/remob.c
+++ b/remob.c
@ -1019,7 +1019,7 @@ int RemobCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
        SCPrintf(pCon, eError, "ERROR: illegal host:port");
        return 0;
      }
-      snprintf(host, sizeof host, "%.*s", p - argv[3], argv[3]);
+      snprintf(host, sizeof host, "%.*s", (int)(p - argv[3]), argv[3]);
      remserver = RemServerInit(argv[2], host, atoi(p + 1));
    }
    if (!remserver) {