stoddard 99/01/22 08:10:56
Modified: pthreads/src/include scoreboard.h
pthreads/src/main http_main.c http_config.c
Log:
Clean-up some comments.
Revision Changes Path
1.2 +1 -1 apache-apr/pthreads/src/include/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apache-apr/pthreads/src/include/scoreboard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scoreboard.h 1999/01/21 23:08:32 1.1
+++ scoreboard.h 1999/01/22 16:10:54 1.2
@@ -57,7 +57,7 @@
#ifndef APACHE_SCOREBOARD_H
#define APACHE_SCOREBOARD_H
-#include "pthread.h" /* ZZZ WGS added this... */
+#include "pthread.h"
#ifdef __cplusplus
extern "C" {
#endif
1.2 +9 -9 apache-apr/pthreads/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-apr/pthreads/src/main/http_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- http_main.c 1999/01/21 23:08:33 1.1
+++ http_main.c 1999/01/22 16:10:55 1.2
@@ -957,7 +957,7 @@
"make_sock: for %s, setsockopt: (SO_REUSEADDR)", addr);
printf("make_sock: failed to setsockopt for %s\n", addr);
close(s);
- return NULL; /* -1 ==> NULL WGS */
+ return NULL;
}
#endif /*_OSD_POSIX*/
one = 1;
@@ -967,7 +967,7 @@
ap_log_error(APLOG_MARK, APLOG_CRIT, server_conf,
"make_sock: for %s, setsockopt: (SO_KEEPALIVE)", addr);
close(s);
- return NULL; /* -1 ==> NULL WGS */
+ return NULL;
}
#endif
#endif
@@ -1048,7 +1048,7 @@
"found, you probably need to rebuild Apache with a "
"larger FD_SETSIZE", addr, s, FD_SETSIZE);
close(s);
- return NULL; /* -1 ==> NULL WGS */
+ return NULL;
}
#endif
@@ -1085,9 +1085,9 @@
exit(1);
}
*nr = *lr;
- ap_kill_cleanups_for_socket(p, nr->fd); /*
ap_kill_cleanups_for_fd|socket ?? WGS */
+ ap_kill_cleanups_for_socket(p, nr->fd);
nr->next = old_listeners;
- nr->index = 0; /* WGS from Dean's work... */
+ nr->index = 0;
old_listeners = nr;
lr = lr->next;
} while (lr && lr != ap_listeners);
@@ -1101,7 +1101,7 @@
for (or = old_listeners; or; or = or->next) {
printf("find_listener: or->fd = %d\n", or->fd);
if (!memcmp(&or->local_addr, &lr->local_addr, sizeof(or->local_addr))) {
- or->index = 1; /* WGS from Dean's work */
+ or->index = 1;
return or->fd;
}
}
@@ -1341,7 +1341,7 @@
listen_rec *lr;
int sd; /* filedesc */
int csd = 0; /* filedesc */
- ulong len = sizeof(struct sockaddr); /* WGS */
+ ulong len = sizeof(struct sockaddr);
printf("in accept_loop\n");
@@ -1409,7 +1409,7 @@
* socket options, file descriptors, and read/write buffers.
*/
/* ZZZ change to AP func */
- if (getsockname(csd, &sa_server, &len) < 0) { /* WGS */
+ if (getsockname(csd, &sa_server, &len) < 0) {
ap_log_error(APLOG_MARK, APLOG_ERR, server_conf, "getsockname");
return;
}
@@ -1422,7 +1422,7 @@
current_conn = new_connection(ptrans, server_conf, conn_io,
(const struct sockaddr_in *) sa_client,
(const struct sockaddr_in *) &sa_server,
- my_child_num); /* WGS, why was this
commented out? */
+ my_child_num);
/*
* Read and process each request found on our connection
1.2 +2 -2 apache-apr/pthreads/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache-apr/pthreads/src/main/http_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- http_config.c 1999/01/21 23:08:33 1.1
+++ http_config.c 1999/01/22 16:10:55 1.2
@@ -1445,8 +1445,8 @@
new->local_addr.sin_family = AF_INET;
new->local_addr.sin_addr = ap_bind_address;
new->local_addr.sin_port = htons(s->port ? s->port : DEFAULT_HTTP_PORT);
- new->fd = NULL; /* -1 ==> NULL from Dean's work WGS */
- new->index = 0; /* ditto WGS*/
+ new->fd = NULL;
+ new->index = 0;
new->next = NULL;
ap_listeners = new;
}
