Tiny simplification

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index ce1569d021f9248a372dd2d71ffc9bc68a3f74ec..ced113053610b06bf8b96827e875deb93975d924 100644 (file)
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -1150,16 +1150,15 @@ ssize_t read_smb_length_return_keepalive(int fd,
 ssize_t read_smb_length(int fd, char *inbuf, unsigned int timeout, enum smb_read_errors *pre)
 {
        ssize_t len;
+       uint8_t msgtype = SMBkeepalive;
 
-       for(;;) {
-               len = read_smb_length_return_keepalive(fd, inbuf, timeout, pre);
-
-               if(len < 0)
+       while (msgtype == SMBkeepalive) {
+               len = read_smb_length_return_keepalive(fd, inbuf, timeout,
+                                                      pre);
+               if (len < 0) {
                        return len;
-
-               /* Ignore session keepalives. */
-               if(CVAL(inbuf,0) != SMBkeepalive)
-                       break;
+               }
+               msgtype = CVAL(inbuf, 0);
        }
 
        DEBUG(10,("read_smb_length: got smb length of %lu\n",