about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-06-17 16:52:40 +0000
committerUlrich Drepper <drepper@redhat.com>2006-06-17 16:52:40 +0000
commitac55a25bfc4c4e32d7e8b4acad140767c577dbf0 (patch)
treebb5a911bef025d500aaa74f8535049fd45c78f7a
parent02f366b304194e5f7a17a10bfb23bf9d1dda5028 (diff)
downloadglibc-ac55a25bfc4c4e32d7e8b4acad140767c577dbf0.tar.gz
glibc-ac55a25bfc4c4e32d7e8b4acad140767c577dbf0.tar.xz
glibc-ac55a25bfc4c4e32d7e8b4acad140767c577dbf0.zip
[BZ #2792]
2006-06-17  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2792]
	* elf/dl-deps.c (expand_dst): Rename __cnt variable to not
	conflict with DL_DST_REQUIRED.
-rw-r--r--ChangeLog6
-rw-r--r--elf/dl-deps.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e5fdef898d..868054e870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-17  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2792]
+	* elf/dl-deps.c (expand_dst): Rename __cnt variable to not
+	conflict with DL_DST_REQUIRED.
+
 2006-06-16  Ulrich Drepper  <drepper@redhat.com>
 
 	* nis/nis_subr.c (nis_getnames): Fix the implementation to better
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index fd3b5243fd..c35cc977fa 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -1,5 +1,5 @@
 /* Load the dependencies of a mapped object.
-   Copyright (C) 1996-2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -92,7 +92,7 @@ struct list
   {
     int done;			/* Nonzero if this map was processed.  */
     struct link_map *map;	/* The data.  */
-    struct list *next;	/* Elements for normal list.  */
+    struct list *next;		/* Elements for normal list.  */
   };
 
 
@@ -101,9 +101,9 @@ struct list
   ({									      \
     const char *__str = (str);						      \
     const char *__result = __str;					      \
-    size_t __cnt = DL_DST_COUNT(__str, 0);				      \
+    size_t __dst_cnt = DL_DST_COUNT (__str, 0);				      \
 									      \
-    if (__cnt != 0)							      \
+    if (__dst_cnt != 0)							      \
       {									      \
 	char *__newp;							      \
 									      \
@@ -113,9 +113,9 @@ struct list
 DST not allowed in SUID/SGID programs"));				      \
 									      \
 	__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str),  \
-						   __cnt));		      \
+						   __dst_cnt));		      \
 									      \
-	__result = _dl_dst_substitute (l, __str, __newp, 0);	      \
+	__result = _dl_dst_substitute (l, __str, __newp, 0);		      \
 									      \
 	if (*__result == '\0')						      \
 	  {								      \