[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.

diff --git a/ChangeLog b/ChangeLog
index e5fdef898dffa1381ab71309fb9cea20212a7d9e..868054e870ddf269362e51ba477c6ea6cb315b9b 100644 (file)
--- 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 fd3b5243fda7e381a459f1afdc042398b0ee908f..c35cc977fa5f2363cd7047dd2eb8d9f08bd3deb1 100644 (file)
--- 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')                                                \
          {                                                                   \