Author: gahr (ports committer) Date: Wed Mar 31 13:51:31 2010 New Revision: 205979 URL: http://svn.freebsd.org/changeset/base/205979
Log: MFC r205606 Remove const'ness from dlerror(3) prototype, for consistency with POSIX. Approved by: cognet Modified: stable/8/include/dlfcn.h stable/8/lib/libc/gen/dlfcn.c stable/8/lib/libc/gen/dlopen.3 stable/8/libexec/rtld-elf/rtld.c Directory Properties: stable/8/include/ (props changed) stable/8/lib/libc/ (props changed) stable/8/lib/libc/stdtime/ (props changed) stable/8/libexec/ (props changed) stable/8/libexec/rtld-elf/ (props changed) Modified: stable/8/include/dlfcn.h ============================================================================== --- stable/8/include/dlfcn.h Wed Mar 31 12:52:19 2010 (r205978) +++ stable/8/include/dlfcn.h Wed Mar 31 13:51:31 2010 (r205979) @@ -117,8 +117,7 @@ typedef struct dl_serinfo { __BEGIN_DECLS /* XSI functions first. */ int dlclose(void *); -const char * - dlerror(void); +char *dlerror(void); void *dlopen(const char *, int); void *dlsym(void * __restrict, const char * __restrict); Modified: stable/8/lib/libc/gen/dlfcn.c ============================================================================== --- stable/8/lib/libc/gen/dlfcn.c Wed Mar 31 12:52:19 2010 (r205978) +++ stable/8/lib/libc/gen/dlfcn.c Wed Mar 31 13:51:31 2010 (r205979) @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <link.h> #include <stddef.h> -static const char sorry[] = "Service unavailable"; +static char sorry[] = "Service unavailable"; /* * For ELF, the dynamic linker directly resolves references to its @@ -69,7 +69,7 @@ dlclose(void *handle) } #pragma weak dlerror -const char * +char * dlerror(void) { return sorry; Modified: stable/8/lib/libc/gen/dlopen.3 ============================================================================== --- stable/8/lib/libc/gen/dlopen.3 Wed Mar 31 12:52:19 2010 (r205978) +++ stable/8/lib/libc/gen/dlopen.3 Wed Mar 31 13:51:31 2010 (r205979) @@ -52,7 +52,7 @@ .Fn dlsym "void * restrict handle" "const char * restrict symbol" .Ft dlfunc_t .Fn dlfunc "void * restrict handle" "const char * restrict symbol" -.Ft const char * +.Ft char * .Fn dlerror "void" .Ft int .Fn dlclose "void *handle" Modified: stable/8/libexec/rtld-elf/rtld.c ============================================================================== --- stable/8/libexec/rtld-elf/rtld.c Wed Mar 31 12:52:19 2010 (r205978) +++ stable/8/libexec/rtld-elf/rtld.c Wed Mar 31 13:51:31 2010 (r205979) @@ -1961,7 +1961,7 @@ dlclose(void *handle) return 0; } -const char * +char * dlerror(void) { char *msg = error_message; _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"