guile/guile-core/libguile ChangeLog hash.c hash...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/12/12 05:57:26

Modified files:
        guile-core/libguile: ChangeLog hash.c hash.h symbols.c symbols.h 

Log message:
        * Moved function scm_string_hash to hash.c.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1203&r2=1.1204
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/hash.c.diff?r1=1.37&r2=1.38
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/hash.h.diff?r1=1.8&r2=1.9
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/symbols.c.diff?r1=1.71&r2=1.72
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/symbols.h.diff?r1=1.47&r2=1.48

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1203 
guile/guile-core/libguile/ChangeLog:1.1204
--- guile/guile-core/libguile/ChangeLog:1.1203  Mon Dec 11 10:09:35 2000
+++ guile/guile-core/libguile/ChangeLog Tue Dec 12 05:57:26 2000
@@ -1,3 +1,8 @@
+2000-12-12  Dirk Herrmann  <address@hidden>
+
+       * hash.[ch] (scm_string_hash), symbols.[ch] (scm_string_hash):
+       Moved function scm_string_hash to hash.c.
+
 2000-12-11  Marius Vollmer  <address@hidden>
 
        * gc_os_dep.c (scm_get_stack_base) [MSWIN32]: Added detection of
Index: guile/guile-core/libguile/hash.c
diff -u guile/guile-core/libguile/hash.c:1.37 
guile/guile-core/libguile/hash.c:1.38
--- guile/guile-core/libguile/hash.c:1.37       Sat Nov 25 08:58:25 2000
+++ guile/guile-core/libguile/hash.c    Tue Dec 12 05:57:26 2000
@@ -61,6 +61,28 @@
 #endif
 
 
+unsigned long 
+scm_string_hash (const unsigned char *str, scm_sizet len)
+{
+  if (len > 5)
+    {
+      scm_sizet i = 5;
+      unsigned long h = 264;
+      while (i--)
+       h = (h << 8) + ((unsigned) (scm_downcase (str[h % len])));
+      return h;
+    }
+  else
+    {
+      scm_sizet i = len;
+      unsigned long h = 0;
+      while (i)
+       h = (h << 8) + ((unsigned) (scm_downcase (str[--i])));
+      return h;
+    }
+}
+
+
 /* Dirk:FIXME:: why downcase for characters? (2x: scm_hasher, scm_ihashv) */
 /* Dirk:FIXME:: scm_hasher could be made static. */
 
Index: guile/guile-core/libguile/hash.h
diff -u guile/guile-core/libguile/hash.h:1.8 
guile/guile-core/libguile/hash.h:1.9
--- guile/guile-core/libguile/hash.h:1.8        Mon Jun 12 05:28:23 2000
+++ guile/guile-core/libguile/hash.h    Tue Dec 12 05:57:26 2000
@@ -48,6 +48,7 @@
 
 
 
+extern unsigned long scm_string_hash (const unsigned char *str, scm_sizet len);
 extern unsigned long scm_hasher (SCM obj, unsigned long n, scm_sizet d);
 extern unsigned int scm_ihashq (SCM obj, unsigned int n);
 extern SCM scm_hashq (SCM obj, SCM n);
Index: guile/guile-core/libguile/symbols.c
diff -u guile/guile-core/libguile/symbols.c:1.71 
guile/guile-core/libguile/symbols.c:1.72
--- guile/guile-core/libguile/symbols.c:1.71    Fri Dec  8 09:08:34 2000
+++ guile/guile-core/libguile/symbols.c Tue Dec 12 05:57:26 2000
@@ -48,6 +48,7 @@
 #include "libguile/_scm.h"
 #include "libguile/chars.h"
 #include "libguile/eval.h"
+#include "libguile/hash.h"
 #include "libguile/smob.h"
 #include "libguile/variable.h"
 #include "libguile/alist.h"
@@ -79,28 +80,6 @@
 
 /* {Symbols}
  */
-
-
-unsigned long 
-scm_string_hash (const unsigned char *str, scm_sizet len)
-{
-  if (len > 5)
-    {
-      scm_sizet i = 5;
-      unsigned long h = 264;
-      while (i--)
-       h = (h << 8) + ((unsigned) (scm_downcase (str[h % len])));
-      return h;
-    }
-  else
-    {
-      scm_sizet i = len;
-      unsigned long h = 0;
-      while (i)
-       h = (h << 8) + ((unsigned) (scm_downcase (str[--i])));
-      return h;
-    }
-}
 
 
 /* scm_sym2vcell
Index: guile/guile-core/libguile/symbols.h
diff -u guile/guile-core/libguile/symbols.h:1.47 
guile/guile-core/libguile/symbols.h:1.48
--- guile/guile-core/libguile/symbols.h:1.47    Fri Dec  8 08:32:36 2000
+++ guile/guile-core/libguile/symbols.h Tue Dec 12 05:57:26 2000
@@ -71,8 +71,6 @@
 
 
 
-extern unsigned long scm_string_hash (const unsigned char *str, scm_sizet len);
-
 extern SCM scm_mem2symbol (const char*, scm_sizet);
 extern SCM scm_str2symbol (const char*);