Date: Wed, 24 Mar 2010 15:59:51 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r205606 - in head: include lib/libc/gen libexec/rtld-elf Message-ID: <201003241559.o2OFxpWB044846@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr (ports committer) Date: Wed Mar 24 15:59:51 2010 New Revision: 205606 URL: http://svn.freebsd.org/changeset/base/205606 Log: - Remove const'ness from dlerror(3) prototype, for consistency with POSIX. Approved by: cognet MFC after: 1 week Modified: head/include/dlfcn.h head/lib/libc/gen/dlfcn.c head/lib/libc/gen/dlopen.3 head/libexec/rtld-elf/rtld.c Modified: head/include/dlfcn.h ============================================================================== --- head/include/dlfcn.h Wed Mar 24 15:40:18 2010 (r205605) +++ head/include/dlfcn.h Wed Mar 24 15:59:51 2010 (r205606) @@ -113,8 +113,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: head/lib/libc/gen/dlfcn.c ============================================================================== --- head/lib/libc/gen/dlfcn.c Wed Mar 24 15:40:18 2010 (r205605) +++ head/lib/libc/gen/dlfcn.c Wed Mar 24 15:59:51 2010 (r205606) @@ -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: head/lib/libc/gen/dlopen.3 ============================================================================== --- head/lib/libc/gen/dlopen.3 Wed Mar 24 15:40:18 2010 (r205605) +++ head/lib/libc/gen/dlopen.3 Wed Mar 24 15:59:51 2010 (r205606) @@ -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: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Wed Mar 24 15:40:18 2010 (r205605) +++ head/libexec/rtld-elf/rtld.c Wed Mar 24 15:59:51 2010 (r205606) @@ -1961,7 +1961,7 @@ dlclose(void *handle) return 0; } -const char * +char * dlerror(void) { char *msg = error_message;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003241559.o2OFxpWB044846>