[PVFS2-CVS] commit by slang in pvfs2/src/io/bmi/bmi_tcp: sockio.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp
In directory parlweb:/tmp/cvs-serv12853/src/io/bmi/bmi_tcp

Modified Files:
      Tag: slang-sio-branch
	sockio.c 
Log Message:
removed extra line from merge. removed unneeded parens.


Index: sockio.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/sockio.c,v
diff -p -u -r1.20.2.1 -r1.20.2.2
--- sockio.c	4 Nov 2005 07:14:18 -0000	1.20.2.1
+++ sockio.c	4 Nov 2005 16:09:06 -0000	1.20.2.2
@@ -190,8 +190,7 @@ int BMI_sockio_brecv(int s,
 	    return (-1);
 	}
 	comp -= ret;
-	buf = ((char *)buf) + ret;
-	buf = (char *) buf + ret;
+	buf = (char *)buf + ret;
     }
     fcntl(s, F_SETFL, oldfl|O_NONBLOCK);
     return (len - comp);
@@ -226,7 +225,7 @@ int BMI_sockio_nbrecv(int s,
 	    return (-1);
 	}
 	comp -= ret;
-	buf = ((char *)buf) + ret;
+	buf = (char *)buf + ret;
     }
     return (len - comp);
 }
@@ -294,7 +293,7 @@ int BMI_sockio_bsend(int s,
 	    return (-1);
 	}
 	comp -= ret;
-	buf = ((char *)buf) + ret;
+	buf = (char *)buf + ret;
     }
     fcntl(s, F_SETFL, oldfl | O_NONBLOCK);
     return (len - comp);
@@ -322,7 +321,7 @@ int BMI_sockio_nbsend(int s,
 	else if (ret == -1)
 	    return (-1);
 	comp -= ret;
-	buf = ((char *)buf) + ret;
+	buf = (char *)buf + ret;
     }
     return (len - comp);
 }