Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/076e54e1e5bfabba7cf2cba02ba13a86f3dc9ba1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/076e54e1e5bfabba7cf2cba02ba13a86f3dc9ba1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/076e54e1e5bfabba7cf2cba02ba13a86f3dc9ba1
The branch, master has been updated
via 076e54e1e5bfabba7cf2cba02ba13a86f3dc9ba1 (commit)
via 67796f2f7719bab44df4299587fc57f43886a47f (commit)
from c2da6cbd25101cba9ae31a8fdebc253a61ff79cc (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=076e54e1e5bfabba7cf2cba02ba13a86f3dc9ba1
commit 076e54e1e5bfabba7cf2cba02ba13a86f3dc9ba1
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Increase slab size to 8K (recommended size)
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 5584ecb..6722ca8 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -46,7 +46,7 @@
#define FAILURE (FALSE)
#define NO !
-ULONG __slab_max_size = 4096; /* Enable clib2's slab allocator */
+ULONG __slab_max_size = 8192; /* Enable clib2's slab allocator */
/* Diskfont */
struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG
flags)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=67796f2f7719bab44df4299587fc57f43886a47f
commit 67796f2f7719bab44df4299587fc57f43886a47f
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix some warnings
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 5e2af74..5584ecb 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -26,6 +26,9 @@
#include <inttypes.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <dirent.h>
#include <proto/bullet.h>
#include <proto/exec.h>
@@ -59,7 +62,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
char *p = 0;
struct FontContentsHeader fch;
- if(p = strrchr(fileName, '.'))
+ if((p = strrchr(fileName, '.')))
*p = '\0';
fontpath = (STRPTR)ASPrintf("FONTS:%s.font", fileName);
@@ -98,7 +101,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
}
size = GetFileSize(fh);
- buffer = (struct TagItem *)AllocVec(size, MEMF_ANY);
+ buffer = (UBYTE *)AllocVec(size, MEMF_ANY);
if(buffer == NULL) {
LOG("Unable to allocate memory");
Close(fh);
@@ -119,9 +122,9 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
}
/* Relocate all the OT_Indirect tags */
- while (ti = NextTagItem(&tag)) {
+ while((ti = NextTagItem(&tag))) {
if(ti->ti_Tag & OT_Indirect) {
- ti->ti_Data += buffer;
+ ti->ti_Data += (ULONG)buffer;
}
}
@@ -136,7 +139,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
return NULL;
}
- BulletBase = OpenLibrary(fname, 0L);
+ BulletBase = (struct BulletBase *)OpenLibrary(fname, 0L);
if(BulletBase == NULL) {
LOG("Unable to open font engine %s", fname);
@@ -150,8 +153,8 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
gengine = OpenEngine();
SetInfo(gengine,
- OT_OTagPath, otagpath,
- OT_OTagList, buffer,
+ OT_OTagPath, (ULONG)otagpath,
+ OT_OTagList, (ULONG)buffer,
TAG_DONE);
of = AllocVec(sizeof(struct OutlineFont), MEMF_CLEAR);
@@ -170,7 +173,7 @@ void CloseOutlineFont(struct OutlineFont *of, struct List
*list)
struct BulletBase *BulletBase = of->BulletBase;
CloseEngine(of->GEngine);
- CloseLibrary(BulletBase);
+ CloseLibrary((struct Library *)BulletBase);
FreeVec(of->OTagPath);
FreeVec(of->olf_OTagList);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/os3support.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 5e2af74..6722ca8 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -26,6 +26,9 @@
#include <inttypes.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <dirent.h>
#include <proto/bullet.h>
#include <proto/exec.h>
@@ -43,7 +46,7 @@
#define FAILURE (FALSE)
#define NO !
-ULONG __slab_max_size = 4096; /* Enable clib2's slab allocator */
+ULONG __slab_max_size = 8192; /* Enable clib2's slab allocator */
/* Diskfont */
struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG
flags)
@@ -59,7 +62,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
char *p = 0;
struct FontContentsHeader fch;
- if(p = strrchr(fileName, '.'))
+ if((p = strrchr(fileName, '.')))
*p = '\0';
fontpath = (STRPTR)ASPrintf("FONTS:%s.font", fileName);
@@ -98,7 +101,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
}
size = GetFileSize(fh);
- buffer = (struct TagItem *)AllocVec(size, MEMF_ANY);
+ buffer = (UBYTE *)AllocVec(size, MEMF_ANY);
if(buffer == NULL) {
LOG("Unable to allocate memory");
Close(fh);
@@ -119,9 +122,9 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
}
/* Relocate all the OT_Indirect tags */
- while (ti = NextTagItem(&tag)) {
+ while((ti = NextTagItem(&tag))) {
if(ti->ti_Tag & OT_Indirect) {
- ti->ti_Data += buffer;
+ ti->ti_Data += (ULONG)buffer;
}
}
@@ -136,7 +139,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
return NULL;
}
- BulletBase = OpenLibrary(fname, 0L);
+ BulletBase = (struct BulletBase *)OpenLibrary(fname, 0L);
if(BulletBase == NULL) {
LOG("Unable to open font engine %s", fname);
@@ -150,8 +153,8 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct
List *list, ULONG fl
gengine = OpenEngine();
SetInfo(gengine,
- OT_OTagPath, otagpath,
- OT_OTagList, buffer,
+ OT_OTagPath, (ULONG)otagpath,
+ OT_OTagList, (ULONG)buffer,
TAG_DONE);
of = AllocVec(sizeof(struct OutlineFont), MEMF_CLEAR);
@@ -170,7 +173,7 @@ void CloseOutlineFont(struct OutlineFont *of, struct List
*list)
struct BulletBase *BulletBase = of->BulletBase;
CloseEngine(of->GEngine);
- CloseLibrary(BulletBase);
+ CloseLibrary((struct Library *)BulletBase);
FreeVec(of->OTagPath);
FreeVec(of->olf_OTagList);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
