netsurf: branch master updated. 55c6841eca063e8fe4db0b8ac67c8a61da9b7312

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Wed Nov 7 22:51:34 GMT 2012


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/55c6841eca063e8fe4db0b8ac67c8a61da9b7312
...commit http://git.netsurf-browser.org/netsurf.git/commit/55c6841eca063e8fe4db0b8ac67c8a61da9b7312
...tree http://git.netsurf-browser.org/netsurf.git/tree/55c6841eca063e8fe4db0b8ac67c8a61da9b7312

The branch, master has been updated
       via  55c6841eca063e8fe4db0b8ac67c8a61da9b7312 (commit)
       via  f37a8ad58be683bc42e7cff692c78797a580b921 (commit)
      from  9482bb464a157265a555dfa38fcf2dc37ade12fd (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/commitdiff/55c6841eca063e8fe4db0b8ac67c8a61da9b7312
commit 55c6841eca063e8fe4db0b8ac67c8a61da9b7312
Merge: f37a8ad 9482bb4
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Merge branch 'master' of git://git.netsurf-browser.org/netsurf



commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/f37a8ad58be683bc42e7cff692c78797a580b921
commit f37a8ad58be683bc42e7cff692c78797a580b921
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Remove extraneous debug

diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index 1308771..4493976 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -299,15 +299,11 @@ ULONG ami_font_scan_list(struct MinList *list)
 		af = (struct AvailFonts *)&(afh[1]);
 
 		for(i = 0; i < afh->afh_NumEntries; i++) {
-			LOG(("AvailFonts entry %ld", i));
 			if(af[i].af_Attr.ta_Style == FS_NORMAL) {
 				if(af[i].af_Attr.ta_Name != NULL) {
-					LOG(("Checking font %s", af[i].af_Attr.ta_Name));
 					node = (struct nsObject *)FindIName((struct List *)list,
 								af[i].af_Attr.ta_Name);
-					LOG(("Node address %lx", node));	
 					if(node == NULL) {
-						LOG(("Node address (2) %lx", node));
 						node = AddObject(list, AMINS_UNKNOWN);
 						if(node) {
 							node->dtz_Node.ln_Name = strdup(af[i].af_Attr.ta_Name);
@@ -481,7 +477,7 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save,
 			if(nsoption_bool(font_unicode_only) == false)
 				entries += ami_font_scan_list(list);
 
-			LOG(("Found %ld fonts\n", entries));
+			LOG(("Found %ld fonts", entries));
 
 			win = ami_font_scan_gui_open(entries);
 			found = ami_font_scan_fonts(list, win, glypharray);


-----------------------------------------------------------------------

Summary of changes:
 amiga/font_scan.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index 4190e68..8f909ad 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -299,15 +299,11 @@ ULONG ami_font_scan_list(struct MinList *list)
 		af = (struct AvailFonts *)&(afh[1]);
 
 		for(i = 0; i < afh->afh_NumEntries; i++) {
-			LOG(("AvailFonts entry %ld", i));
 			if(af[i].af_Attr.ta_Style == FS_NORMAL) {
 				if(af[i].af_Attr.ta_Name != NULL) {
-					LOG(("Checking font %s", af[i].af_Attr.ta_Name));
 					node = (struct nsObject *)FindIName((struct List *)list,
 								af[i].af_Attr.ta_Name);
-					LOG(("Node address %lx", node));	
 					if(node == NULL) {
-						LOG(("Node address (2) %lx", node));
 						node = AddObject(list, AMINS_UNKNOWN);
 						if(node) {
 							node->dtz_Node.ln_Name = strdup(af[i].af_Attr.ta_Name);
@@ -480,7 +476,7 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save,
 			if(nsoption_bool(font_unicode_only) == false)
 				entries += ami_font_scan_list(list);
 
-			LOG(("Found %ld fonts\n", entries));
+			LOG(("Found %ld fonts", entries));
 
 			win = ami_font_scan_gui_open(entries);
 			found = ami_font_scan_fonts(list, win, glypharray);


-- 
NetSurf Browser



More information about the netsurf-commits mailing list