smbd: Move fast_string_hash() to mangle_hash.c, the only user

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index 46541e9e52552c0a59b7f8f73691ecae04019d5a..d5035f97d4e2285d92cf81a1b20192331521a8e9 100644 (file)
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -1099,6 +1099,22 @@ static const struct mangle_fns mangle_hash_fns = {
        hash_name_to_8_3
 };
 
+/***************************************************************
+ Compute a hash value based on a string key value.
+ The function returns the bucket index number for the hashed key.
+ JRA. Use a djb-algorithm hash for speed.
+***************************************************************/
+
+static unsigned int fast_string_hash(TDB_DATA *key)
+{
+        unsigned int n = 0;
+        const char *p;
+        for (p = (const char *)key->dptr; *p != '\0'; p++) {
+                n = ((n << 5) + n) ^ (unsigned int)(*p);
+        }
+        return n;
+}
+
 /* return the methods for this mangling implementation */
 const struct mangle_fns *mangle_hash_init(void)
 {

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 4c1792d39320b6e0ffc3359912fa47f84a0470ca..dfd955aab036b6c54ee03983e18661fb9f4d6a2a 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1176,7 +1176,6 @@ void send_stat_cache_delete_message(struct messaging_context *msg_ctx,
                                    const char *name);
 void stat_cache_delete(const char *name);
 struct TDB_DATA;
-unsigned int fast_string_hash(struct TDB_DATA *key);
 bool reset_stat_cache( void );
 
 /* The following definitions come from smbd/statvfs.c  */

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 3b7a3c4f4f0d5d7a16cd8a69b64141a73eaf75dd..f8d58214c45a4aff850fad22ee988845b2765bcd 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -433,22 +433,6 @@ void stat_cache_delete(const char *name)
        TALLOC_FREE(lname);
 }
 
-/***************************************************************
- Compute a hash value based on a string key value.
- The function returns the bucket index number for the hashed key.
- JRA. Use a djb-algorithm hash for speed.
-***************************************************************/
-
-unsigned int fast_string_hash(TDB_DATA *key)
-{
-        unsigned int n = 0;
-        const char *p;
-        for (p = (const char *)key->dptr; *p != '\0'; p++) {
-                n = ((n << 5) + n) ^ (unsigned int)(*p);
-        }
-        return n;
-}
-
 /***************************************************************************
  Initializes or clears the stat cache.
 **************************************************************************/