NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commit1de4b9a

committed

Modernize dlopen interface code for FreeBSD and OpenBSD.

Remove the hard-wired assumption that __mips__ (and only __mips__) lacksdlopen in FreeBSD and OpenBSD. This assumption is outdated at least forOpenBSD, as per report from an anonymous 9.1 tester. We can perfectly welluse HAVE_DLOPEN instead to decide which code to use.Some other cosmetic adjustments to make freebsd.c, netbsd.c, and openbsd.cexactly alike.

1 parent00a9229 commit1de4b9aCopy full SHA for 1de4b9a

File tree

3 files changed

+13

-13

lines changed

src/backend/port/dynloader

3 files changed

+13

-13

lines changed

`‎src/backend/port/dynloader/freebsd.c`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ BSD44_derived_dlerror(void)`
`61`	`61`	`void*`
`62`	`62`	`BSD44_derived_dlopen(constchar*file,intnum)`
`63`	`63`	`{`
`64`		`-#if defined(__mips__)`
	`64`	`+#if!defined(HAVE_DLOPEN)`
`65`	`65`	`snprintf(error_message,sizeof(error_message),`
`66`	`66`	`"dlopen (%s) not supported",file);`
`67`	`67`	`returnNULL;`
`@@ -78,7 +78,7 @@ BSD44_derived_dlopen(const char *file, int num)`
`78`	`78`	`void*`
`79`	`79`	`BSD44_derived_dlsym(voidhandle,constcharname)`
`80`	`80`	`{`
`81`		`-#if defined(__mips__)`
	`81`	`+#if!defined(HAVE_DLOPEN)`
`82`	`82`	`snprintf(error_message,sizeof(error_message),`
`83`	`83`	`"dlsym (%s) failed",name);`
`84`	`84`	`returnNULL;`
`@@ -93,7 +93,7 @@ BSD44_derived_dlsym(void handle, const char name)`
`93`	`93`	`snprintf(buf,sizeof(buf),"_%s",name);`
`94`	`94`	`name=buf;`
`95`	`95`	`}`
`96`		`-#endif`
	`96`	`+#endif/* !__ELF__ */`
`97`	`97`	`if ((vp=dlsym(handle, (char*)name))==NULL)`
`98`	`98`	`snprintf(error_message,sizeof(error_message),`
`99`	`99`	`"dlsym (%s) failed",name);`
`@@ -104,8 +104,7 @@ BSD44_derived_dlsym(void handle, const char name)`
`104`	`104`	`void`
`105`	`105`	`BSD44_derived_dlclose(void*handle)`
`106`	`106`	`{`
`107`		`-#if defined(__mips__)`
`108`		`-#else`
	`107`	`+#if defined(HAVE_DLOPEN)`
`109`	`108`	`dlclose(handle);`
`110`	`109`	`#endif`
`111`	`110`	`}`

`‎src/backend/port/dynloader/netbsd.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,17 +82,18 @@ BSD44_derived_dlsym(void handle, const char name)`
`82`	`82`	`snprintf(error_message,sizeof(error_message),`
`83`	`83`	`"dlsym (%s) failed",name);`
`84`	`84`	`returnNULL;`
`85`		`-#elif defined(__ELF__)`
`86`		`-returndlsym(handle,name);`
`87`	`85`	`#else`
`88`	`86`	`void*vp;`
	`87`	`+`
	`88`	`+#ifndef__ELF__`
`89`	`89`	`charbuf[BUFSIZ];`
`90`	`90`
`91`	`91`	`if (*name!='_')`
`92`	`92`	`{`
`93`	`93`	`snprintf(buf,sizeof(buf),"_%s",name);`
`94`	`94`	`name=buf;`
`95`	`95`	`}`
	`96`	`+#endif/* !__ELF__ */`
`96`	`97`	`if ((vp=dlsym(handle, (char*)name))==NULL)`
`97`	`98`	`snprintf(error_message,sizeof(error_message),`
`98`	`99`	`"dlsym (%s) failed",name);`

`‎src/backend/port/dynloader/openbsd.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ BSD44_derived_dlerror(void)`
`61`	`61`	`void*`
`62`	`62`	`BSD44_derived_dlopen(constchar*file,intnum)`
`63`	`63`	`{`
`64`		`-#if defined(__mips__)`
	`64`	`+#if!defined(HAVE_DLOPEN)`
`65`	`65`	`snprintf(error_message,sizeof(error_message),`
`66`	`66`	`"dlopen (%s) not supported",file);`
`67`	`67`	`returnNULL;`
`@@ -78,21 +78,22 @@ BSD44_derived_dlopen(const char *file, int num)`
`78`	`78`	`void*`
`79`	`79`	`BSD44_derived_dlsym(voidhandle,constcharname)`
`80`	`80`	`{`
`81`		`-#if defined(__mips__)`
	`81`	`+#if!defined(HAVE_DLOPEN)`
`82`	`82`	`snprintf(error_message,sizeof(error_message),`
`83`	`83`	`"dlsym (%s) failed",name);`
`84`	`84`	`returnNULL;`
`85`		`-#elif defined(__ELF__)`
`86`		`-returndlsym(handle,name);`
`87`	`85`	`#else`
`88`	`86`	`void*vp;`
	`87`	`+`
	`88`	`+#ifndef__ELF__`
`89`	`89`	`charbuf[BUFSIZ];`
`90`	`90`
`91`	`91`	`if (*name!='_')`
`92`	`92`	`{`
`93`	`93`	`snprintf(buf,sizeof(buf),"_%s",name);`
`94`	`94`	`name=buf;`
`95`	`95`	`}`
	`96`	`+#endif/* !__ELF__ */`
`96`	`97`	`if ((vp=dlsym(handle, (char*)name))==NULL)`
`97`	`98`	`snprintf(error_message,sizeof(error_message),`
`98`	`99`	`"dlsym (%s) failed",name);`
`@@ -103,8 +104,7 @@ BSD44_derived_dlsym(void handle, const char name)`
`103`	`104`	`void`
`104`	`105`	`BSD44_derived_dlclose(void*handle)`
`105`	`106`	`{`
`106`		`-#if defined(__mips__)`
`107`		`-#else`
	`107`	`+#if defined(HAVE_DLOPEN)`
`108`	`108`	`dlclose(handle);`
`109`	`109`	`#endif`
`110`	`110`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1de4b9a

File tree

3 files changed

3 files changed

`‎src/backend/port/dynloader/freebsd.c`

`‎src/backend/port/dynloader/netbsd.c`

`‎src/backend/port/dynloader/openbsd.c`

0 commit comments