qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(dl_main): Correct indentation. Use bool as type for the variables which are used as booleans.

This commit is contained in:
Ulrich Drepper 2002-02-06 03:42:42 +00:00
parent 37beecf77c
commit 164a7164f7
1 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
elf/rtld.c
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <fcntl.h> #include <fcntl.h>
#include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -464,10 +465,10 @@ dl_main (const ElfW(Phdr) *phdr,
unsigned int npreloads; unsigned int npreloads;
size_t file_size; size_t file_size;
char *file; char *file;
int has_interp = 0; bool has_interp = false;
unsigned int i; unsigned int i;
int prelinked = 0; bool prelinked = false;
int rtld_is_main = 0; bool rtld_is_main = false;
#ifndef HP_TIMING_NONAVAIL #ifndef HP_TIMING_NONAVAIL
hp_timing_t start; hp_timing_t start;
hp_timing_t stop; hp_timing_t stop;
@ -497,7 +498,7 @@ dl_main (const ElfW(Phdr) *phdr,
pay attention to its PT_INTERP command (we are the interpreter pay attention to its PT_INTERP command (we are the interpreter
ourselves). This is an easy way to test a new ld.so before ourselves). This is an easy way to test a new ld.so before
installing it. */ installing it. */
rtld_is_main = 1; rtld_is_main = true;
/* Note the place where the dynamic linker actually came from. */ /* Note the place where the dynamic linker actually came from. */
GL(dl_rtld_map).l_name = _dl_argv[0]; GL(dl_rtld_map).l_name = _dl_argv[0];
@ -689,7 +690,7 @@ of this helper program; chances are you did not intend to run this program.\n\
} }
} }
has_interp = 1; has_interp = true;
break; break;
case PT_LOAD: case PT_LOAD:
{ {
@ -1210,7 +1211,7 @@ of this helper program; chances are you did not intend to run this program.\n\
if (r_list == r_listend && liblist == liblistend) if (r_list == r_listend && liblist == liblistend)
prelinked = 1; prelinked = true;
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS, 0)) if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS, 0))
_dl_printf ("\nprelink checking: %s\n", prelinked ? "ok" : "failed"); _dl_printf ("\nprelink checking: %s\n", prelinked ? "ok" : "failed");