From: wessels <>
Date: Fri, 21 Aug 1998 02:43:45 +0000 (+0000)
Subject: cleanup
X-Git-Tag: SQUID_3_0_PRE1~2830
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1707acbe5afd93c2801acdd982b9e1c040dfd0d4;p=thirdparty%2Fsquid.git

cleanup
---

diff --git a/test-suite/tcp-banger2.c b/test-suite/tcp-banger2.c
index 1fc0cdd950..2c6abfd2a0 100644
--- a/test-suite/tcp-banger2.c
+++ b/test-suite/tcp-banger2.c
@@ -194,61 +194,61 @@ read_reply(int fd, void *data)
     struct _request *r = data;
     static unsigned char buf[READ_BUF_SZ];
     int len;
+    int used = 0;
     if ((len = read(fd, buf, READ_BUF_SZ)) <= 0) {
 	fd_close(fd);
 	reqpersec++;
 	nrequests++;
-    } else {
-	int used = 0;
-	total_bytes_read += len;
-	if (r->headfound < 2) {
-	    char *p, *header = NULL;
-	    int oldlen = strlen(r->buf);
-	    int newlen = oldlen + len;
-	    assert(oldlen <= READ_BUF_SZ);
-	    memcpy(r->buf + oldlen, buf, len);
-	    r->buf[newlen + 1] = '\0';
-	    for (p = r->buf; r->headfound < 2 && used < newlen; p++, used++) {
-		switch (*p) {
-		case '\n':
-		    r->headfound++;
-		    if (header) {
-			/* Decode header */
-			if (strncasecmp(header, "Content-Length:", 15) == 0)
-			    r->content_length = atoi(header + 15);
-			if (strncasecmp(header, "X-Request-URI:", 14) == 0) {
-			    /* Check URI */
-			    if (strncmp(r->url, header + 15, strcspn(header + 15, "\r\n"))) {
-				char url[8192];
-				strncpy(url, header + 15, strcspn(header + 15, "\r\n"));
-				url[strcspn(header + 15, "\r\n")] = '\n';
-				fprintf(stderr, "ERROR: Sent %s received %s\n",
-				    r->url, url);
-			    }
-			}
-			header = NULL;
-		    }
-		    break;
-		case '\r':
-		    break;
-		default:
-		    r->headfound = 0;
-		    if (!header)
-			header = p;
+	return;
+    }
+    total_bytes_read += len;
+    if (r->headfound < 2) {
+	char *p, *header = NULL;
+	int oldlen = strlen(r->buf);
+	int newlen = oldlen + len;
+	assert(oldlen <= READ_BUF_SZ);
+	memcpy(r->buf + oldlen, buf, len);
+	r->buf[newlen + 1] = '\0';
+	for (p = r->buf; r->headfound < 2 && used < newlen; p++, used++) {
+	    switch (*p) {
+	    case '\n':
+		r->headfound++;
+		if (!header)
 		    break;
+		/* Decode header */
+		if (strncasecmp(header, "Content-Length:", 15) == 0)
+		    r->content_length = atoi(header + 15);
+		if (strncasecmp(header, "X-Request-URI:", 14) == 0) {
+		    /* Check URI */
+		    if (strncmp(r->url, header + 15, strcspn(header + 15, "\r\n"))) {
+			char url[8192];
+			strncpy(url, header + 15, strcspn(header + 15, "\r\n"));
+			url[strcspn(header + 15, "\r\n")] = '\n';
+			fprintf(stderr, "ERROR: Sent %s received %s\n",
+			    r->url, url);
+		    }
 		}
+		header = NULL;
+		break;
+	    case '\r':
+		break;
+	    default:
+		r->headfound = 0;
+		if (!header)
+		    header = p;
+		break;
 	    }
-	    if (header) {
-		memmove(r->buf, header, newlen - (header - r->buf) + 1);
-	    }
-	    assert(used >= oldlen);
-	    used -= oldlen;
 	}
-	r->bodysize += len - used;
-	if (opt_checksum) {
-	    for (; used < len; used++) {
-		r->sum += buf[used];
-	    }
+	if (header) {
+	    memmove(r->buf, header, newlen - (header - r->buf) + 1);
+	}
+	assert(used >= oldlen);
+	used -= oldlen;
+    }
+    r->bodysize += len - used;
+    if (opt_checksum) {
+	for (; used < len; used++) {
+	    r->sum += buf[used];
 	}
     }
 }