pci.h: The error callback is now declared with PCI_NONRET

Users of the repeatedly complain that the library crashes, which is
usually caused by providing an error hook which returns to the library.
Let's try warning them more explicitly.

diff --git a/lib/init.c b/lib/init.c
index caa57ec8665e692590a782eb1190e2c87eafaaf4..e8bc93710e7a82e3f0ca386e6c22de578f4e555c 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -96,7 +96,7 @@ static int probe_sequence[] = {
   -1,
 };
 
-static void
+static void PCI_NONRET
 pci_generic_error(char *msg, ...)
 {
   va_list args;

diff --git a/lib/pci.h b/lib/pci.h
index 814247691086d9329b66509ae23323312797e479..328a468a7bf918c13beccb30881a4b85d07cb3ca 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -62,7 +62,7 @@ struct pci_access {
   int debugging;                       /* Turn on debugging messages */
 
   /* Functions you can override: */
-  void (*error)(char *msg, ...) PCI_PRINTF(1,2);       /* Write error message and quit */
+  void (*error)(char *msg, ...) PCI_PRINTF(1,2) PCI_NONRET;    /* Write error message and quit */
   void (*warning)(char *msg, ...) PCI_PRINTF(1,2);     /* Write a warning message */
   void (*debug)(char *msg, ...) PCI_PRINTF(1,2);       /* Write a debugging message */