diff options
| author | Doug MacEachern <dougm@covalent.net> | 2001-06-11 15:19:45 -0700 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-06-12 13:13:27 +0000 |
| commit | c6c619a96fa11b09bef26d0c724b6cfd0bdbb34b (patch) | |
| tree | 00f4b8ab49ed4e56e2be3401170b6d1b6bca3e61 /ext/DynaLoader | |
| parent | 6676db263f08eab1c09a46739d7c3c0d2ea7f6df (diff) | |
| download | perl-c6c619a96fa11b09bef26d0c724b6cfd0bdbb34b.tar.gz | |
ext/ + -Wall
Message-ID: <Pine.LNX.4.21.0106112212261.24181-100000@mako.covalent.net>
p4raw-id: //depot/perl@10534
Diffstat (limited to 'ext/DynaLoader')
| -rw-r--r-- | ext/DynaLoader/dl_dlopen.xs | 25 | ||||
| -rw-r--r-- | ext/DynaLoader/dlutils.c | 4 |
2 files changed, 16 insertions, 13 deletions
diff --git a/ext/DynaLoader/dl_dlopen.xs b/ext/DynaLoader/dl_dlopen.xs index e1b2a82410..7d099bee02 100644 --- a/ext/DynaLoader/dl_dlopen.xs +++ b/ext/DynaLoader/dl_dlopen.xs @@ -155,12 +155,13 @@ BOOT: (void)dl_private_init(aTHX); -void * +void dl_load_file(filename, flags=0) char * filename int flags PREINIT: int mode = RTLD_LAZY; + void *handle; CODE: { #if defined(DLOPEN_WONT_DO_RELATIVE_PATHS) @@ -184,13 +185,13 @@ dl_load_file(filename, flags=0) Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename); #endif DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags)); - RETVAL = dlopen(filename, mode) ; - DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%lx\n", (unsigned long) RETVAL)); + handle = dlopen(filename, mode) ; + DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%lx\n", (unsigned long) handle)); ST(0) = sv_newmortal() ; - if (RETVAL == NULL) + if (handle == NULL) SaveError(aTHX_ "%s",dlerror()) ; else - sv_setiv( ST(0), PTR2IV(RETVAL)); + sv_setiv( ST(0), PTR2IV(handle)); } @@ -207,10 +208,12 @@ dl_unload_file(libref) RETVAL -void * +void dl_find_symbol(libhandle, symbolname) void * libhandle char * symbolname + PREINIT: + void *sym; CODE: #ifdef DLSYM_NEEDS_UNDERSCORE symbolname = Perl_form_nocontext("_%s", symbolname); @@ -218,19 +221,19 @@ dl_find_symbol(libhandle, symbolname) DLDEBUG(2, PerlIO_printf(Perl_debug_log, "dl_find_symbol(handle=%lx, symbol=%s)\n", (unsigned long) libhandle, symbolname)); - RETVAL = dlsym(libhandle, symbolname); + sym = dlsym(libhandle, symbolname); DLDEBUG(2, PerlIO_printf(Perl_debug_log, - " symbolref = %lx\n", (unsigned long) RETVAL)); + " symbolref = %lx\n", (unsigned long) sym)); ST(0) = sv_newmortal() ; - if (RETVAL == NULL) + if (sym == NULL) SaveError(aTHX_ "%s",dlerror()) ; else - sv_setiv( ST(0), PTR2IV(RETVAL)); + sv_setiv( ST(0), PTR2IV(sym)); void dl_undef_symbols() - PPCODE: + CODE: diff --git a/ext/DynaLoader/dlutils.c b/ext/DynaLoader/dlutils.c index 9d88f5fdad..bb06fe4b20 100644 --- a/ext/DynaLoader/dlutils.c +++ b/ext/DynaLoader/dlutils.c @@ -27,7 +27,7 @@ static int dl_debug = 0; /* value copied from $DynaLoader::dl_debug */ #define DLDEBUG(level,code) #endif - +#ifdef DL_UNLOAD_ALL_AT_EXIT /* Close all dlopen'd files */ static void dl_unload_all_files(pTHXo_ void *unused) @@ -51,7 +51,7 @@ dl_unload_all_files(pTHXo_ void *unused) } } } - +#endif static void dl_generic_private_init(pTHXo) /* called by dl_*.xs dl_private_init() */ |