first part removes deadstore.
second part fixes using 'rs' as uninitalized.
Index: inetd.c
===================================================================
RCS file: /cvs/src/usr.sbin/inetd/inetd.c,v
retrieving revision 1.135
diff -u -p -r1.135 inetd.c
--- inetd.c 19 Apr 2013 18:03:16 -0000 1.135
+++ inetd.c 17 Jun 2013 18:46:20 -0000
@@ -1678,10 +1678,8 @@ chargen_stream(int s, struct servtab *se
inetd_setproctitle(sep->se_service, s);
- if (!endring) {
+ if (!endring)
initring();
- rs = ring;
- }
text[LINESIZ] = '\r';
text[LINESIZ + 1] = '\n';
@@ -1710,10 +1708,9 @@ chargen_dg(int s, struct servtab *sep)
socklen_t size;
char text[LINESIZ+2];
- if (endring == 0) {
+ if (endring == 0)
initring();
- rs = ring;
- }
+ rs = ring;
size = sizeof(ss);
if (recvfrom(s, text, sizeof(text), 0, (struct sockaddr *)&ss,