* inet/rcmd.c (iruserfopen): Remove redundant initialization.

	From Bernhard Fischer <rep.nop@aon.at>.

	* posix/regcomp.c (calc_eclosure_iter): Remove dead variables.
	Reported by Mike Frysinger <vapier@gentoo.org>.

diff --git a/ChangeLog b/ChangeLog
index 7a74fea..6a9e3d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-31  Roland McGrath  <roland@redhat.com>
+
+       * inet/rcmd.c (iruserfopen): Remove redundant initialization.
+       From Bernhard Fischer <rep.nop@aon.at>.
+
+       * posix/regcomp.c (calc_eclosure_iter): Remove dead variables.
+       Reported by Mike Frysinger <vapier@gentoo.org>.
+
 2006-01-30  Steven Munroe  <sjmunroe@us.ibm.com>
 
        * sysdeps/ieee754/ldbl-128ibm/k_cosl.c (__kernel_cosl): Correct index

diff --git a/inet/rcmd.c b/inet/rcmd.c
index da6c070..341304a 100644 (file)
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -477,7 +477,6 @@ iruserfopen (const char *file, uid_t okuser)
   /* If not a regular file, if owned by someone other than user or
      root, if writeable by anyone but the owner, or if hardlinked
      anywhere, quit.  */
-  cp = NULL;
   if (__lxstat64 (_STAT_VER, file, &st))
     cp = _("lstat failed");
   else if (!S_ISREG (st.st_mode))

diff --git a/posix/regcomp.c b/posix/regcomp.c
index d35ae5f..78a1218 100644 (file)
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -1644,8 +1644,6 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root)
       && dfa->edests[node].nelem
       && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
     {
-      int org_node, cur_node;
-      org_node = cur_node = node;
       err = duplicate_node_closure (dfa, node, node, node, constraint);
       if (BE (err != REG_NOERROR, 0))
        return err;