From: Eric Blake Date: Wed, 4 Jul 2007 21:28:00 +0000 (+0000) Subject: * libltdl/ltdl.c (advise_dup): Delete function no longer used X-Git-Tag: release-2-1b~103 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59bc6b59d0ef3d7cbde73389fc94dc7b7f40eca9;p=thirdparty%2Flibtool.git * libltdl/ltdl.c (advise_dup): Delete function no longer used after memleak fix three days ago. --- diff --git a/ChangeLog b/ChangeLog index 0a0a3255d..427aa98dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-04 Eric Blake + + * libltdl/ltdl.c (advise_dup): Delete function no longer used + after memleak fix three days ago. + 2007-07-03 Ralf Wildenhues * libltdl/m4/libtool.m4 (_LT_ENABLE_LOCK) [ solaris ]: Cater to @@ -116,7 +121,7 @@ (func_mode_link) [cygwin|mingw]: Don't call dirname and basename directly; use func_dirname and func_basename when computing cwrapper names. Use cwrapper to generate - wrapper script, and use pathname returned by + wrapper script, and use pathname returned by func_ltwrapper_scriptname instead of $output. (func_mode_link) [NOT cygwin|mingw]: move wrapper script generation for non-win32 inside case statement, as default @@ -154,7 +159,7 @@ Use C89-compatible syntax to mimic variadic macros. Adjust all callers. (func_emit_libtool_cwrapperexe_source) [check_executable]: - avoid embedded #ifdefs; use S_IXGRP and S_IXOTH + avoid embedded #ifdefs; use S_IXGRP and S_IXOTH unconditionally. (func_emit_libtool_cwrapperexe_source) [make_executable]: ditto. @@ -184,8 +189,8 @@ value to determine full absolute pathname of wrapper script, in $objdir. Unconditionally write script out to this pathname and set permission bits. Remove extraneous ';' from debugging loop. - (f_e_l_c_s: main) [mingw]: DOS-ize $SHELL before populating - newargv[0]; if $TARGETSHELL environment variable is set, use + (f_e_l_c_s: main) [mingw]: DOS-ize $SHELL before populating + newargv[0]; if $TARGETSHELL environment variable is set, use it instead of $SHELL and do not DOS-ize. Ensure newargv[1] (wrapper script absolute path) uses only '/', not '\'. Make sure to call execv() with DOS-ized $SHELL (or un-DOS-ized diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 76a5a7820..23e606113 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -123,7 +123,6 @@ static int tryall_dlopen (lt_dlhandle *handle, lt_dladvise padvise, const lt_dlvtable *vtable); static int unload_deplibs (lt_dlhandle handle); -static lt__advise *advise_dup (lt__advise *advise); static int lt_argz_insert (char **pargz, size_t *pargz_len, char *before, const char *entry); static int lt_argz_insertinorder (char **pargz, size_t *pargz_len, @@ -342,7 +341,7 @@ lt_dlexit (void) the dlhandle is stored at the address given in PHANDLE. */ static int tryall_dlopen (lt_dlhandle *phandle, const char *filename, - lt_dladvise padvise, const lt_dlvtable *vtable) + lt_dladvise padvise, const lt_dlvtable *vtable) { lt__handle * handle = (lt__handle *) handles; const char * saved_error = 0; @@ -1247,7 +1246,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext, if (vtable) { - *phandle = (lt_dlhandle) lt__zalloc (sizeof (lt__handle)); + *phandle = (lt_dlhandle) lt__zalloc (sizeof (lt__handle)); if (*phandle == NULL) { @@ -1547,13 +1546,6 @@ lt_dladvise_global (lt_dladvise *padvise) return 0; } -static lt__advise * -advise_dup (lt__advise *advise) -{ - lt__advise *dup = (lt__advise *) lt__zalloc (sizeof (lt__advise)); - return (lt__advise *) memcpy (dup, advise, sizeof (lt__advise)); -} - /* Libtool-1.5.x interface for loading a new module named FILENAME. */ lt_dlhandle lt_dlopen (const char *filename)