system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 20:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few small fixes.

Browse source
This commit is contained in:
Alexandre Julliard 2004-06-01 19:47:11 +00:00
parent 4f9ebc471f
commit 6d2099f4f8
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
loader/preloader.c
View file

@ -156,9 +156,10 @@ __ASM_GLOBAL_FUNC(_start,
* %x prints a hex number * %x prints a hex number
* %s prints a string * %s prints a string
*/ */
static void wld_vsprintf(char *str, char *fmt, va_list args ) static void wld_vsprintf(char *str, const char *fmt, va_list args )
{ {
char *p = fmt; static const char hex_chars[16] = "0123456789abcdef";
const char *p = fmt;
while( *p ) while( *p )
{ {
@ -167,15 +168,10 @@ static void wld_vsprintf(char *str, char *fmt, va_list args )
p++; p++;
if( *p == 'x' ) if( *p == 'x' )
{ {
int ch, i, x = va_arg( args, int ); int i;
unsigned int x = va_arg( args, unsigned int );
for(i=7; i>=0; i--) for(i=7; i>=0; i--)
{ *str++ = hex_chars[(x>>(i*4))&0xf];
ch = (x>>(i*4))&0xf;
ch += '0';
if(ch>'9')
ch+=('A'-10-'0');
*str++ = ch;
}
} }
else if( *p == 's' ) else if( *p == 's' )
{ {
@ -192,7 +188,7 @@ static void wld_vsprintf(char *str, char *fmt, va_list args )
*str = 0; *str = 0;
} }
static void wld_printf(char *fmt, ... ) static void wld_printf(const char *fmt, ... )
{ {
va_list args; va_list args;
char buffer[256]; char buffer[256];
@ -203,7 +199,7 @@ static void wld_printf(char *fmt, ... )
write(2, buffer, strlen(buffer)); write(2, buffer, strlen(buffer));
} }
static void fatal_error(char *fmt, ... ) static void fatal_error(const char *fmt, ... )
{ {
va_list args; va_list args;
char buffer[256]; char buffer[256];
@ -253,7 +249,11 @@ static void set_auxiliary( ElfW(auxv_t) *av, int type, long int val )
{ {
for ( ; av->a_type != AT_NULL; av++) for ( ; av->a_type != AT_NULL; av++)
if( av->a_type == type ) if( av->a_type == type )
{
av->a_un.a_val = val; av->a_un.a_val = val;
return;
}
wld_printf( "wine-preloader: cannot set auxiliary value %x, please report\n", type );
} }
/* /*
@ -525,7 +525,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, char *var )
const ElfW(Phdr) *ph; const ElfW(Phdr) *ph;
const ElfW(Sym) *symtab = NULL; const ElfW(Sym) *symtab = NULL;
const char *strings = NULL; const char *strings = NULL;
Elf_Symndx i, symtabend = 0; uint32_t i, symtabend = 0;
/* check the values */ /* check the values */
#ifdef DUMP_SYMS #ifdef DUMP_SYMS
@ -556,7 +556,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, char *var )
if( dyn->d_tag == DT_SYMTAB ) if( dyn->d_tag == DT_SYMTAB )
symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr;
if( dyn->d_tag == DT_HASH ) if( dyn->d_tag == DT_HASH )
symtabend = *((const Elf_Symndx *)dyn->d_un.d_ptr + 1); symtabend = *((const uint32_t *)dyn->d_un.d_ptr + 1);
#ifdef DUMP_SYMS #ifdef DUMP_SYMS
wld_printf("%x %x\n", dyn->d_tag, dyn->d_un.d_ptr ); wld_printf("%x %x\n", dyn->d_tag, dyn->d_un.d_ptr );
#endif #endif