Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/5aa2feaa06fc7850a4c4892293b1174a8d4ed92c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/5aa2feaa06fc7850a4c4892293b1174a8d4ed92c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/5aa2feaa06fc7850a4c4892293b1174a8d4ed92c
The branch, master has been updated
via 5aa2feaa06fc7850a4c4892293b1174a8d4ed92c (commit)
via 7543833037e1e44f8f4b6ce950c4d7833bd93c42 (commit)
via 404b522119daf6d49687a304c9fa2693e8e8f81a (commit)
from 2d5db505e70336e56e739d56d8ca358fc6bc4a6a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5aa2feaa06fc7850a4c4892293b1174a8d4ed92c
commit 5aa2feaa06fc7850a4c4892293b1174a8d4ed92c
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Call CloseLibrary
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index c3b1bf9..4c242d2 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -61,6 +61,7 @@
I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct
Library *)PREFIX##Base, INTERFACE, INTVER, NULL); \
if(I##PREFIX == NULL) { \
LOG("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); \
ami_misc_fatal_error(error); \
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7543833037e1e44f8f4b6ce950c4d7833bd93c42
commit 7543833037e1e44f8f4b6ce950c4d7833bd93c42
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Ensure we don't use a half-opened library if it is optional.
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index d727189..c3b1bf9 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -62,7 +62,7 @@
if(I##PREFIX == NULL) { \
LOG("Failed to get %s interface v%d of %s", INTERFACE,
INTVER, LIB); \
if(FAIL == true) { \
- STRPTR error = ASPrintf("Unable to open
interface %s v%d\nof %s v%ld (fatal error)", INTERFACE, INTVER, LIB, LIBVER);
\
+ STRPTR error = ASPrintf("Unable to open
interface %s v%d\nof %s v%ld (fatal error - not an OS4 lib?)", INTERFACE,
INTVER, LIB, LIBVER); \
ami_misc_fatal_error(error); \
FreeVec(error); \
return false; \
@@ -80,7 +80,9 @@
#define AMINS_LIB_CLOSE(PREFIX) \
if(I##PREFIX) DropInterface((struct Interface *)I##PREFIX); \
- if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base);
+ if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); \
+ I##PREFIX = NULL; \
+ PREFIX##Base = NULL;
#define AMINS_LIB_STRUCT(PREFIX) \
struct PREFIX##Base *PREFIX##Base = NULL; \
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=404b522119daf6d49687a304c9fa2693e8e8f81a
commit 404b522119daf6d49687a304c9fa2693e8e8f81a
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fail if the library interface doesn't open.
This will happen when attempting to open old 68k libraries with no separate
interface file, but may also occur when the interface name or version doesn't
exist (although the library version number _should_ prevent that)
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index 00facf9..d727189 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -61,6 +61,12 @@
I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct
Library *)PREFIX##Base, INTERFACE, INTVER, NULL); \
if(I##PREFIX == NULL) { \
LOG("Failed to get %s interface v%d of %s", INTERFACE,
INTVER, LIB); \
+ if(FAIL == true) { \
+ STRPTR error = ASPrintf("Unable to open
interface %s v%d\nof %s v%ld (fatal error)", INTERFACE, INTVER, LIB, LIBVER);
\
+ ami_misc_fatal_error(error); \
+ FreeVec(error); \
+ return false; \
+ } \
} \
} else { \
LOG("Failed to open %s v%d", LIB, LIBVER); \
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/libs.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index 00facf9..4c242d2 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -61,6 +61,13 @@
I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct
Library *)PREFIX##Base, INTERFACE, INTVER, NULL); \
if(I##PREFIX == NULL) { \
LOG("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); \
+ ami_misc_fatal_error(error); \
+ FreeVec(error); \
+ return false; \
+ } \
} \
} else { \
LOG("Failed to open %s v%d", LIB, LIBVER); \
@@ -74,7 +81,9 @@
#define AMINS_LIB_CLOSE(PREFIX) \
if(I##PREFIX) DropInterface((struct Interface *)I##PREFIX); \
- if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base);
+ if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); \
+ I##PREFIX = NULL; \
+ PREFIX##Base = NULL;
#define AMINS_LIB_STRUCT(PREFIX) \
struct PREFIX##Base *PREFIX##Base = NULL; \
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
