diff options
| -rw-r--r-- | utils/ldconfig.c | 16 | ||||
| -rw-r--r-- | utils/ldd.c | 12 | ||||
| -rw-r--r-- | utils/readsoname2.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/utils/ldconfig.c b/utils/ldconfig.c index f6aec5c82..3bd7cee36 100644 --- a/utils/ldconfig.c +++ b/utils/ldconfig.c @@ -173,8 +173,8 @@ static char *xstrdup(const char *str) #define readsonameXX readsoname64 #define __ELF_NATIVE_CLASS 64 #include "readsoname2.c" -char *readsoname(char *name, FILE *infile, int expected_type, - int *type, int elfclass) +static char *readsoname(char *name, FILE *infile, int expected_type, + int *type, int elfclass) { char *res; @@ -206,8 +206,8 @@ char *readsoname(char *name, FILE *infile, int expected_type, * If the expected, actual/deduced types missmatch we display a warning * and use the actual/deduced type. */ -char *is_shlib(const char *dir, const char *name, int *type, - int *islink, int expected_type) +static char *is_shlib(const char *dir, const char *name, int *type, + int *islink, int expected_type) { char *good = NULL; char *cp, *cp2; @@ -323,7 +323,7 @@ char *is_shlib(const char *dir, const char *name, int *type, } /* update the symlink to new library */ -void link_shlib(const char *dir, const char *file, const char *so) +static void link_shlib(const char *dir, const char *file, const char *so) { int change = 1; char libname[BUFFER_SIZE]; @@ -380,7 +380,7 @@ void link_shlib(const char *dir, const char *file, const char *so) } /* figure out which library is greater */ -int libcmp(char *p1, char *p2) +static int libcmp(char *p1, char *p2) { while (*p1) { if (isdigit(*p1) && isdigit(*p2)) { @@ -412,7 +412,7 @@ struct lib { }; /* update all shared library links in a directory */ -void scan_dir(const char *rawname) +static void scan_dir(const char *rawname) { DIR *dir; const char *name; @@ -554,7 +554,7 @@ void cache_write(void) } #else /* return the list of system-specific directories */ -char *get_extpath(void) +static char *get_extpath(void) { char *res = NULL, *cp; FILE *file; diff --git a/utils/ldd.c b/utils/ldd.c index 1f1dc2516..02b37f1cb 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -214,7 +214,7 @@ static char *elf_find_rpath(ElfW(Ehdr) *ehdr, ElfW(Dyn) *dynamic) return NULL; } -int check_elf_header(ElfW(Ehdr) *const ehdr) +static int check_elf_header(ElfW(Ehdr) *const ehdr) { if (!ehdr || *(uint32_t*)ehdr != ELFMAG_U32 || ehdr->e_ident[EI_CLASS] != ELFCLASSM @@ -249,7 +249,7 @@ int check_elf_header(ElfW(Ehdr) *const ehdr) static caddr_t cache_addr = NULL; static size_t cache_size = 0; -int map_cache(void) +static int map_cache(void) { int fd; struct stat st; @@ -306,7 +306,7 @@ fail: return -1; } -int unmap_cache(void) +static int unmap_cache(void) { if (cache_addr == NULL || cache_addr == (caddr_t) - 1) return -1; @@ -372,8 +372,8 @@ static void search_for_named_library(char *name, char *result, *result = '\0'; } -void locate_library_file(ElfW(Ehdr) *ehdr, ElfW(Dyn) *dynamic, int is_suid, - struct library *lib) +static void locate_library_file(ElfW(Ehdr) *ehdr, ElfW(Dyn) *dynamic, + int is_suid, struct library *lib) { char *buf; char *path; @@ -608,7 +608,7 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr) /* #warning "There may be two warnings here about vfork() clobbering, ignore them" */ -int find_dependancies(char *filename) +static int find_dependancies(char *filename) { int is_suid = 0; FILE *thefile; diff --git a/utils/readsoname2.c b/utils/readsoname2.c index a74b46aa1..5cda3318d 100644 --- a/utils/readsoname2.c +++ b/utils/readsoname2.c @@ -1,4 +1,4 @@ -char *readsonameXX(char *name, FILE *infile, int expected_type, int *type) +static char *readsonameXX(char *name, FILE *infile, int expected_type, int *type) { ElfW(Ehdr) *epnt; ElfW(Phdr) *ppnt; |