html link fixes

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 0b34eb2c7a7a126d0f59311aa940018ae1852aea..15d0c18c308d47e4ff4ced2fdd156d70c526ec1f 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -4,6 +4,7 @@ FFI:
 [error] SideKick$BufferChangeHandler: We have cplusplus.xml (/home/slava/jEdit/modes/) but got event for DefaultInputHandler.java (/home/slava/jEdit/org/gjt/sp/jedit/gui/)\r
 [error] SideKick$BufferChangeHandler: We have cplusplus.xml (/home/slava/jEdit/modes/) but got event for DefaultInputHandler.java (/home/slava/jEdit/org/gjt/sp/jedit/gui/)\r
 \r
+- fix responder generated links\r
 - profiler is inaccurate: wrong word on cs\r
 - buffer change handler in sidekick is screwed\r
 - dec> bin> oct> hex> throw errors\r

diff --git a/library/httpd/html.factor b/library/httpd/html.factor
index 0573bc945c299a108d7cace0cbe3bcb87613bf37..607aa81e816bd32a49ce3d0fbf8bca7bf06449c7 100644 (file)
--- a/library/httpd/html.factor
+++ b/library/httpd/html.factor
@@ -111,7 +111,8 @@ USE: url-encoding
     ] ifte* ;
 
 : object-link-href ( path -- href )
-    "/inspect/" swap cat2 ;
+    #! Perhaps this should not be hard-coded.
+    "/responder/inspect/" swap cat2 ;
 
 : object-link-tag ( style quot -- )
     over "object-link" swap assoc [
@@ -122,7 +123,7 @@ USE: url-encoding
 
 : icon-tag ( string style quot -- )
     over "icon" swap assoc dup [
-        <img src= "/resource/" swap cat2 img/>
+        <img src= "/responder/resource/" swap cat2 img/>
         #! Ignore the quotation, since no further style
         #! can be applied
         3drop

diff --git a/native/ffi.c b/native/ffi.c
index ad43ec17b92858c4c996c7282c808ccfe9185805..bc2138323e776fa67ecee9d9ea9dac6074f1aa23 100644 (file)
--- a/native/ffi.c
+++ b/native/ffi.c
@@ -227,7 +227,7 @@ void collect_alien(ALIEN* alien)
 {
        if(alien->local && alien->ptr != NULL)
        {
-               STRING* ptr = alien->ptr - sizeof(STRING);
+               STRING* ptr = (STRING*)(alien->ptr - sizeof(STRING));
                ptr = copy_untagged_object(ptr,SSIZE(ptr));
                alien->ptr = (CELL)ptr + sizeof(STRING);
        }

diff --git a/native/memory.c b/native/memory.c
index 2dedc4cce41d956f88621fcd7481eb85497a0398..0fdfbf23001509314507853eb67e704cf650b11d 100644 (file)
--- a/native/memory.c
+++ b/native/memory.c
@@ -58,7 +58,7 @@ void allot_profile_step(CELL a)
        executing->allot_count += a;
 }
 
-void check_memory(void)
+void garbage_collection_later(void)
 {
        if(gc_protect)
                return;

diff --git a/native/memory.h b/native/memory.h
index fd4ba1460664632b056dd4e8ab1ea248b0e184ca..440a5f84bf0e2f3bc6f6f42bd4ede42d95c774e8 100644 (file)
--- a/native/memory.h
+++ b/native/memory.h
@@ -18,7 +18,7 @@ void init_zone(ZONE* zone, CELL size);
 void init_arena(CELL size);
 void flip_zones();
 
-void check_memory(void);
+void garbage_collection_later(void);
 void allot_profile_step(CELL a);
 
 INLINE CELL align8(CELL a)
@@ -33,7 +33,7 @@ INLINE void* allot(CELL a)
        if(allot_profiling)
                allot_profile_step(align8(a));
        if(active.here > active.alarm)
-               check_memory();
+               garbage_collection_later();
        return (void*)h;
 }