From 39176736b3b67d7ff528500f5e61b9f62c1f3190 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 2 Sep 2018 17:12:40 +0100
Subject: Log version numbers of opened libraries Log open failures as ERROR
 instead of INFO

---
 frontends/amiga/libs.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'frontends/amiga')

diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index 305818076..ace24bf74 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -59,9 +59,10 @@
 #define AMINS_LIB_OPEN(LIB, LIBVER, PREFIX, INTERFACE, INTVER, FAIL)	\
 	NSLOG(netsurf, INFO, "Opening %s v%d", LIB, LIBVER);		\
 	if((PREFIX##Base = (struct PREFIX##Base *)OpenLibrary(LIB, LIBVER))) {	\
+		NSLOG(netsurf, INFO, " -> opened v%d.%d", ((struct Library *)PREFIX##Base)->lib_Version, ((struct Library *)PREFIX##Base)->lib_Revision);	\
 		I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct Library *)PREFIX##Base, INTERFACE, INTVER, NULL);	\
 		if(I##PREFIX == NULL) {	\
-			NSLOG(netsurf, INFO, "Failed to get %s interface v%d of %s", INTERFACE, INTVER, LIB); \
+			NSLOG(netsurf, ERROR, "Failed to get %s interface v%d of %s", INTERFACE, INTVER, LIB); \
 			AMINS_LIB_CLOSE(PREFIX)	\
 			if(FAIL == true) {	\
 				STRPTR error = ASPrintf("Unable to open interface %s v%d\nof %s v%ld (fatal error - not an OS4 lib?)", INTERFACE, INTVER, LIB, LIBVER);	\
@@ -71,7 +72,7 @@
 			}	\
 		}	\
 	} else {	\
-		NSLOG(netsurf, INFO, "Failed to open %s v%d", LIB, LIBVER); \
+		NSLOG(netsurf, ERROR, "Failed to open %s v%d", LIB, LIBVER); \
 		if(FAIL == true) {	\
 			STRPTR error = ASPrintf("Unable to open %s v%ld (fatal error)", LIB, LIBVER);	\
 			ami_misc_fatal_error(error);	\
@@ -93,15 +94,17 @@
 #define AMINS_CLASS_OPEN(CLASS, CLASSVER, PREFIX, CLASSGET, NEEDINTERFACE)	\
 	NSLOG(netsurf, INFO, "Opening %s v%d", CLASS, CLASSVER);		\
 	if((PREFIX##Base = OpenClass(CLASS, CLASSVER, &PREFIX##Class))) {	\
+		NSLOG(netsurf, INFO, " -> opened v%d.%d", ((struct Library *)PREFIX##Base)->lib_Version, ((struct Library *)PREFIX##Base)->lib_Revision);	\
 		if(NEEDINTERFACE == true) {	\
 			NSLOG(netsurf, INFO, "        + interface");	\
 			I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct Library *)PREFIX##Base, "main", 1, NULL);	\
 			if(I##PREFIX == NULL) {	\
-				NSLOG(netsurf, INFO, "Failed to get main interface v1 of %s", CLASS); \
+				NSLOG(netsurf, ERROR, "Failed to get main interface v1 of %s", CLASS); \
 			}	\
 		}	\
 	}	\
 	if(PREFIX##Class == NULL) {	\
+		NSLOG(netsurf, ERROR, "Failed to open %s v%d", CLASS, CLASSVER); \
 		STRPTR error = ASPrintf("Unable to open %s v%d (fatal error)", CLASS, CLASSVER);	\
 		ami_misc_fatal_error(error);	\
 		FreeVec(error);	\
@@ -121,8 +124,9 @@
 #define AMINS_LIB_OPEN(LIB, LIBVER, PREFIX, INTERFACE, INTVER, FAIL)	\
 	NSLOG(netsurf, INFO, "Opening %s v%d", LIB, LIBVER);		\
 	if((PREFIX##Base = (struct PREFIX##Base *)OpenLibrary(LIB, LIBVER))) {	\
+		NSLOG(netsurf, INFO, " -> opened v%d.%d", ((struct Library *)PREFIX##Base)->lib_Version, ((struct Library *)PREFIX##Base)->lib_Revision);	\
 	} else {	\
-		NSLOG(netsurf, INFO, "Failed to open %s v%d", LIB, LIBVER); \
+		NSLOG(netsurf, ERROR, "Failed to open %s v%d", LIB, LIBVER); \
 		if(FAIL == true) {	\
 			STRPTR error = ASPrintf("Unable to open %s v%d (fatal error)", LIB, LIBVER);	\
 			ami_misc_fatal_error(error);	\
@@ -140,9 +144,11 @@
 #define AMINS_CLASS_OPEN(CLASS, CLASSVER, PREFIX, CLASSGET, NEEDINTERFACE)	\
 	NSLOG(netsurf, INFO, "Opening %s v%d", CLASS, CLASSVER);	\
 	if((PREFIX##Base = OpenLibrary(CLASS, CLASSVER))) {	\
+		NSLOG(netsurf, INFO, " -> opened v%d.%d", ((struct Library *)PREFIX##Base)->lib_Version, ((struct Library *)PREFIX##Base)->lib_Revision);	\
 		PREFIX##Class = CLASSGET##_GetClass();	\
 	}	\
 	if(PREFIX##Class == NULL) {	\
+		NSLOG(netsurf, ERROR, "Failed to open %s v%d", CLASS, CLASSVER); \
 		STRPTR error = ASPrintf("Unable to open %s v%d (fatal error)", CLASS, CLASSVER);	\
 		ami_misc_fatal_error(error);	\
 		FreeVec(error);	\
-- 
cgit v1.2.3