diff options
Diffstat (limited to 'ldso/ldso/ld_string.h')
-rw-r--r-- | ldso/ldso/ld_string.h | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/ldso/ldso/ld_string.h b/ldso/ldso/ld_string.h index caa47aa60..fcdb8768b 100644 --- a/ldso/ldso/ld_string.h +++ b/ldso/ldso/ld_string.h @@ -7,23 +7,27 @@ extern void *_dl_malloc(int size); extern char *_dl_getenv(char *symbol, char **envp); extern void _dl_unsetenv(char *symbol, char **envp); extern char *_dl_strdup(const char *string); -extern char *_dl_get_last_path_component(char *path); -extern size_t _dl_strlen(const char * str); -extern char * _dl_strcpy(char * dst,const char *src); -extern int _dl_strcmp(const char * s1,const char * s2); -extern int _dl_strncmp(const char * s1,const char * s2,size_t len); -extern char * _dl_strchr(const char * str,int c); -extern char *_dl_strrchr(const char *str, int c); -extern void * _dl_memcpy(void * dst, const void * src, size_t len); -extern int _dl_memcmp(const void * s1,const void * s2,size_t len); -extern void * _dl_memset(void * str,int c,size_t len); -extern void _dl_fprintf(int, const char *, ...); +extern void _dl_dprintf(int, const char *, ...); + + +static size_t _dl_strlen(const char * str); +static char * _dl_strcpy(char * dst,const char *src); +static int _dl_strcmp(const char * s1,const char * s2); +static int _dl_strncmp(const char * s1,const char * s2,size_t len); +static char * _dl_strchr(const char * str,int c); +static char *_dl_strrchr(const char *str, int c); +static void * _dl_memcpy(void * dst, const void * src, size_t len); +static int _dl_memcmp(const void * s1,const void * s2,size_t len); +static void * _dl_memset(void * str,int c,size_t len); +static char *_dl_get_last_path_component(char *path); +static char *_dl_simple_ltoa(char * local, unsigned long i); +static char *_dl_simple_ltoahex(char * local, unsigned long i); #ifndef NULL #define NULL ((void *) 0) #endif -static inline size_t _dl_strlen_inline(const char * str) +static inline size_t _dl_strlen(const char * str) { register char *ptr = (char *) str; @@ -32,7 +36,7 @@ static inline size_t _dl_strlen_inline(const char * str) return (ptr - str); } -static inline char * _dl_strcpy_inline(char * dst,const char *src) +static inline char * _dl_strcpy(char * dst,const char *src) { register char *ptr = dst; @@ -43,7 +47,7 @@ static inline char * _dl_strcpy_inline(char * dst,const char *src) return ptr; } -static inline int _dl_strcmp_inline(const char * s1,const char * s2) +static inline int _dl_strcmp(const char * s1,const char * s2) { unsigned register char c1, c2; @@ -58,7 +62,7 @@ static inline int _dl_strcmp_inline(const char * s1,const char * s2) return c1 - c2; } -static inline int _dl_strncmp_inline(const char * s1,const char * s2,size_t len) +static inline int _dl_strncmp(const char * s1,const char * s2,size_t len) { unsigned register char c1 = '\0'; unsigned register char c2 = '\0'; @@ -74,7 +78,7 @@ static inline int _dl_strncmp_inline(const char * s1,const char * s2,size_t len) return c1 - c2; } -static inline char * _dl_strchr_inline(const char * str,int c) +static inline char * _dl_strchr(const char * str,int c) { register char ch; @@ -88,7 +92,7 @@ static inline char * _dl_strchr_inline(const char * str,int c) return 0; } -static inline char *_dl_strrchr_inline(const char *str, int c) +static inline char *_dl_strrchr(const char *str, int c) { register char *prev = 0; register char *ptr = (char *) str; @@ -103,7 +107,7 @@ static inline char *_dl_strrchr_inline(const char *str, int c) return(prev); } -static inline void * _dl_memcpy_inline(void * dst, const void * src, size_t len) +static inline void * _dl_memcpy(void * dst, const void * src, size_t len) { register char *a = dst; register const char *b = src; @@ -115,7 +119,7 @@ static inline void * _dl_memcpy_inline(void * dst, const void * src, size_t len) } -static inline int _dl_memcmp_inline(const void * s1,const void * s2,size_t len) +static inline int _dl_memcmp(const void * s1,const void * s2,size_t len) { unsigned char *c1 = (unsigned char *)s1; unsigned char *c2 = (unsigned char *)s2; @@ -129,7 +133,7 @@ static inline int _dl_memcmp_inline(const void * s1,const void * s2,size_t len) return 0; } -static inline void * _dl_memset_inline(void * str,int c,size_t len) +static inline void * _dl_memset(void * str,int c,size_t len) { register char *a = str; @@ -139,7 +143,7 @@ static inline void * _dl_memset_inline(void * str,int c,size_t len) return str; } -static inline char *_dl_get_last_path_component_inline(char *path) +static inline char *_dl_get_last_path_component(char *path) { char *s; register char *ptr = path; @@ -171,7 +175,7 @@ static inline char *_dl_get_last_path_component_inline(char *path) /* Early on, we can't call printf, so use this to print out * numbers using the SEND_STDERR() macro */ -static inline char *_dl_simple_ltoa_inline(char * local, unsigned long i) +static inline char *_dl_simple_ltoa(char * local, unsigned long i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */ char *p = &local[21]; @@ -183,7 +187,7 @@ static inline char *_dl_simple_ltoa_inline(char * local, unsigned long i) return p + 1; } -static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i) +static inline char *_dl_simple_ltoahex(char * local, unsigned long i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */ char *p = &local[21]; @@ -208,17 +212,17 @@ static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i) #define SEND_STDERR(X) \ { const char *__s = (X); \ if (__s < (const char *) load_addr) __s += load_addr; \ - _dl_write (2, __s, _dl_strlen_inline (__s)); \ + _dl_write (2, __s, _dl_strlen (__s)); \ } #else -#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen_inline(X)); +#define SEND_STDERR(X) _dl_write(2, X, _dl_strlen(X)); #endif #define SEND_ADDRESS_STDERR(X, add_a_newline) { \ char tmp[13], *tmp1; \ - _dl_memset_inline(tmp, 0, sizeof(tmp)); \ - tmp1=_dl_simple_ltoahex_inline( tmp, (unsigned long)(X)); \ - _dl_write(2, tmp1, _dl_strlen_inline(tmp1)); \ + _dl_memset(tmp, 0, sizeof(tmp)); \ + tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \ + _dl_write(2, tmp1, _dl_strlen(tmp1)); \ if (add_a_newline) { \ tmp[0]='\n'; \ _dl_write(2, tmp, 1); \ @@ -227,9 +231,9 @@ static inline char *_dl_simple_ltoahex_inline(char * local, unsigned long i) #define SEND_NUMBER_STDERR(X, add_a_newline) { \ char tmp[13], *tmp1; \ - _dl_memset_inline(tmp, 0, sizeof(tmp)); \ - tmp1=_dl_simple_ltoahex_inline( tmp, (unsigned long)(X)); \ - _dl_write(2, tmp1, _dl_strlen_inline(tmp1)); \ + _dl_memset(tmp, 0, sizeof(tmp)); \ + tmp1=_dl_simple_ltoahex( tmp, (unsigned long)(X)); \ + _dl_write(2, tmp1, _dl_strlen(tmp1)); \ if (add_a_newline) { \ tmp[0]='\n'; \ _dl_write(2, tmp, 1); \ |