mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
Fix comment.
This commit is contained in:
parent
3093e0c713
commit
844c394a05
@ -1,5 +1,5 @@
|
||||
/* Map in a shared object's segments from the file.
|
||||
Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
|
||||
Copyright (C) 1995-2005, 2006, 2007, 2009, 2010 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
|
||||
@ -313,7 +313,7 @@ static char *
|
||||
expand_dynamic_string_token (struct link_map *l, const char *s)
|
||||
{
|
||||
/* We make two runs over the string. First we determine how large the
|
||||
resulting string is and then we copy it over. Since this is now
|
||||
resulting string is and then we copy it over. Since this is no
|
||||
frequently executed operation we are looking here not for performance
|
||||
but rather for code size. */
|
||||
size_t cnt;
|
||||
@ -391,7 +391,7 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
|
||||
size_t len = strlen (cp);
|
||||
|
||||
/* `strsep' can pass an empty string. This has to be
|
||||
interpreted as `use the current directory'. */
|
||||
interpreted as `use the current directory'. */
|
||||
if (len == 0)
|
||||
{
|
||||
static const char curwd[] = "./";
|
||||
@ -1519,7 +1519,7 @@ cannot enable executable stack as shared object requires");
|
||||
/* Print search path. */
|
||||
static void
|
||||
print_search_path (struct r_search_path_elem **list,
|
||||
const char *what, const char *name)
|
||||
const char *what, const char *name)
|
||||
{
|
||||
char buf[max_dirnamelen + max_capstrlen];
|
||||
int first = 1;
|
||||
@ -2044,7 +2044,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
|
||||
fd = -1;
|
||||
|
||||
/* When the object has the RUNPATH information we don't use any
|
||||
RPATHs. */
|
||||
RPATHs. */
|
||||
if (loader == NULL || loader->l_info[DT_RUNPATH] == NULL)
|
||||
{
|
||||
/* This is the executable's map (if there is one). Make sure that
|
||||
@ -2067,7 +2067,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
|
||||
}
|
||||
|
||||
/* If dynamically linked, try the DT_RPATH of the executable
|
||||
itself. NB: we do this for lookups in any namespace. */
|
||||
itself. NB: we do this for lookups in any namespace. */
|
||||
if (fd == -1 && !did_main_map
|
||||
&& main_map != NULL && main_map->l_type != lt_loaded
|
||||
&& cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
|
||||
@ -2164,7 +2164,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
|
||||
|
||||
/* Add another newline when we are tracing the library loading. */
|
||||
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))
|
||||
_dl_debug_printf ("\n");
|
||||
_dl_debug_printf ("\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user