Merge branch 'master' into maverick

- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx

network.c

@@ -67,7 +67,7 @@ struct timeval lastclose = { -1, 0 };
 /*-----------------------------------------------------------------------
    Redefine this function if another means of error reporting is necessary.
 */
-static void NetError(char *pText)
+static void NetError(const char pText[])
 {
 /*
      SICSLogWrite(pText,eError);
@@ -287,8 +287,9 @@ mkChannel *NETConnectWithFlags(char *name, int port, int flags)
 
   iRet = connect(pRes->sockid, (struct sockaddr *) &(pRes->adresse),
                  sizeof(struct sockaddr_in));
-  if (iRet < 0) {
+  if (iRet < 0 && errno ) {
     if (errno != EINPROGRESS) {
+      close(pRes->sockid);
       free(pRes);
       return NULL;
     }
@@ -607,7 +608,7 @@ int NETReadTillTerm(mkChannel * self, long timeout,
   gettimeofday(&start, NULL);
 
   if (pTerm == NULL)
-    pTerm = "";
+    pTerm = strdup("");
 
   length = strlen(pTerm);
   memset(pBuffer, 0, iBufLen);
@@ -842,8 +843,9 @@ mkChannel *UDPOpen(int iPort)
   i = 1;
   setsockopt(pRes->sockid, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(int));
 
+  /*
   assert(pRes->sockid < (sizeof(long) * 8));
-  /* if this fails the masks for select will be to
+  if this fails the masks for select will be to
      short.
    */