Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/511f4cc8001ed09d361651186aad67fcf098b1c6
...commit
http://git.netsurf-browser.org/netsurf.git/commit/511f4cc8001ed09d361651186aad67fcf098b1c6
...tree
http://git.netsurf-browser.org/netsurf.git/tree/511f4cc8001ed09d361651186aad67fcf098b1c6
The branch, master has been updated
via 511f4cc8001ed09d361651186aad67fcf098b1c6 (commit)
via 12fba46d3e738ad6b865500012f85cb0c35cd45d (commit)
from 06c721c5bb6cd06fc35bd0a36a98415758501df8 (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=511f4cc8001ed09d361651186aad67fcf098b1c6
commit 511f4cc8001ed09d361651186aad67fcf098b1c6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add missing include
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 00dba2d..05a8360 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -17,6 +17,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include <proto/iffparse.h>
#include <proto/intuition.h>
#include <proto/exec.h>
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index 2e5d155..ed1272b 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <stdlib.h>
+#include <string.h>
#include <proto/datatypes.h>
#include <proto/dos.h>
#include <proto/intuition.h>
diff --git a/frontends/amiga/dt_sound.c b/frontends/amiga/dt_sound.c
index 8b63d6a..16b4f7c 100644
--- a/frontends/amiga/dt_sound.c
+++ b/frontends/amiga/dt_sound.c
@@ -23,6 +23,8 @@
#ifdef WITH_AMIGA_DATATYPES
#include "amiga/os3support.h"
+#include <string.h>
+
#include <proto/datatypes.h>
#include <proto/dos.h>
#include <proto/intuition.h>
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 2fe7d66..79acb1a 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -22,6 +22,8 @@
#include <proto/icon.h>
#include <workbench/icon.h>
+#include <string.h>
+
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/file.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=12fba46d3e738ad6b865500012f85cb0c35cd45d
commit 12fba46d3e738ad6b865500012f85cb0c35cd45d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Cache codesets structure ourselves
attempt to speed up conversion as apparently codesets is being very slow
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index f16cbba..af5af12 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -36,21 +36,35 @@ static nserror ami_utf8_codesets(const char *string, size_t
len, char **result,
{
char *out;
ULONG utf8_tag, local_tag;
+ static struct codeset *utf8_cs = NULL;
+ static struct codeset *local_cs = NULL;
+
+ if(local_cs == NULL) CodesetsFind(NULL,
+#ifdef __amigaos4__
+ CSA_MIBenum,
nsoption_int(local_codeset),
+#else
+ NULL,
+#endif
+ TAG_DONE);
+
+ if(utf8_cs == NULL) CodesetsFind(NULL,
+ CSA_MIBenum, CS_MIBENUM_UTF_8,
+ TAG_DONE);
if(to_local == false) {
- local_tag = CSA_SourceMIBenum;
- utf8_tag = CSA_DestMIBenum;
+ local_tag = CSA_SourceCodeset;
+ utf8_tag = CSA_DestCodeset;
} else {
- utf8_tag = CSA_SourceMIBenum;
- local_tag = CSA_DestMIBenum;
+ utf8_tag = CSA_SourceCodeset;
+ local_tag = CSA_DestCodeset;
}
out = CodesetsConvertStr(CSA_Source, string,
CSA_SourceLen, len,
#ifdef __amigaos4__
- local_tag,
nsoption_int(local_codeset),
+ local_tag, local_cs,
#endif
- utf8_tag, CS_MIBENUM_UTF_8,
+ utf8_tag, utf8_cs,
CSA_MapForeignChars, TRUE,
TAG_DONE);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/clipboard.c | 1 +
frontends/amiga/dt_picture.c | 1 +
frontends/amiga/dt_sound.c | 2 ++
frontends/amiga/file.c | 2 ++
frontends/amiga/utf8.c | 26 ++++++++++++++++++++------
5 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 00dba2d..05a8360 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -17,6 +17,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include <proto/iffparse.h>
#include <proto/intuition.h>
#include <proto/exec.h>
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index 2e5d155..ed1272b 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <stdlib.h>
+#include <string.h>
#include <proto/datatypes.h>
#include <proto/dos.h>
#include <proto/intuition.h>
diff --git a/frontends/amiga/dt_sound.c b/frontends/amiga/dt_sound.c
index 8b63d6a..16b4f7c 100644
--- a/frontends/amiga/dt_sound.c
+++ b/frontends/amiga/dt_sound.c
@@ -23,6 +23,8 @@
#ifdef WITH_AMIGA_DATATYPES
#include "amiga/os3support.h"
+#include <string.h>
+
#include <proto/datatypes.h>
#include <proto/dos.h>
#include <proto/intuition.h>
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 2fe7d66..79acb1a 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -22,6 +22,8 @@
#include <proto/icon.h>
#include <workbench/icon.h>
+#include <string.h>
+
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/file.h"
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index f16cbba..af5af12 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -36,21 +36,35 @@ static nserror ami_utf8_codesets(const char *string, size_t
len, char **result,
{
char *out;
ULONG utf8_tag, local_tag;
+ static struct codeset *utf8_cs = NULL;
+ static struct codeset *local_cs = NULL;
+
+ if(local_cs == NULL) CodesetsFind(NULL,
+#ifdef __amigaos4__
+ CSA_MIBenum,
nsoption_int(local_codeset),
+#else
+ NULL,
+#endif
+ TAG_DONE);
+
+ if(utf8_cs == NULL) CodesetsFind(NULL,
+ CSA_MIBenum, CS_MIBENUM_UTF_8,
+ TAG_DONE);
if(to_local == false) {
- local_tag = CSA_SourceMIBenum;
- utf8_tag = CSA_DestMIBenum;
+ local_tag = CSA_SourceCodeset;
+ utf8_tag = CSA_DestCodeset;
} else {
- utf8_tag = CSA_SourceMIBenum;
- local_tag = CSA_DestMIBenum;
+ utf8_tag = CSA_SourceCodeset;
+ local_tag = CSA_DestCodeset;
}
out = CodesetsConvertStr(CSA_Source, string,
CSA_SourceLen, len,
#ifdef __amigaos4__
- local_tag,
nsoption_int(local_codeset),
+ local_tag, local_cs,
#endif
- utf8_tag, CS_MIBENUM_UTF_8,
+ utf8_tag, utf8_cs,
CSA_MapForeignChars, TRUE,
TAG_DONE);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
