Commitb9cb132

committed

Sync dlopen error handling for the *BSDs ... seems to me I've done this

before, but they were out of sync again. Per Kris Jurka.

1 parent6e2ff6e commitb9cb132Copy full SHA for b9cb132

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*-`
	`1`	`+/*`
`2`	`2`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`3`	`3`	`* Portions Copyright (c) 1990 The Regents of the University of California.`
`4`	`4`	`* All rights reserved.`
`@@ -37,12 +37,13 @@ static char sccsid[] = "@(#)dl.c5.4 (Berkeley) 2/23/91";`
`37`	`37`	`#endif/* LIBC_SCCS and not lint */`
`38`	`38`
`39`	`39`	`#include"postgres.h"`
`40`		`-#include"dynloader.h"`
`41`	`40`
`42`	`41`	`#include<nlist.h>`
`43`	`42`	`#include<link.h>`
`44`	`43`	`#include<dlfcn.h>`
`45`	`44`
	`45`	`+#include"dynloader.h"`
	`46`	`+`
`46`	`47`	`staticcharerror_message[BUFSIZ];`
`47`	`48`
`48`	`49`	`char*`
`@@ -67,7 +68,7 @@ BSD44_derived_dlopen(const char *file, int num)`
`67`	`68`
`68`	`69`	`if ((vp=dlopen((char*)file,num))==NULL)`
`69`	`70`	`snprintf(error_message,sizeof(error_message),`
`70`		`-"dlopen'%s' failed. (%s)",file,dlerror());`
	`71`	`+"dlopen(%s) failed: %s",file,dlerror());`
`71`	`72`	`returnvp;`
`72`	`73`	`#endif`
`73`	`74`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ BSD44_derived_dlopen(const char *file, int num)`
`68`	`68`
`69`	`69`	`if ((vp=dlopen((char*)file,num))==NULL)`
`70`	`70`	`snprintf(error_message,sizeof(error_message),`
`71`		`-"dlopen (%s) failed",file);`
	`71`	`+"dlopen (%s) failed: %s",file,dlerror());`
`72`	`72`	`returnvp;`
`73`	`73`	`#endif`
`74`	`74`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ BSD44_derived_dlopen(const char *file, int num)`
`68`	`68`
`69`	`69`	`if ((vp=dlopen((char*)file,num))==NULL)`
`70`	`70`	`snprintf(error_message,sizeof(error_message),`
`71`		`-"dlopen (%s) failed",file);`
	`71`	`+"dlopen (%s) failed: %s",file,dlerror());`
`72`	`72`	`returnvp;`
`73`	`73`	`#endif`
`74`	`74`	`}`

Comments

(0)