Remove hash.c

diff --git a/Makefile b/Makefile
index fdb173ea432ef03ae205989905b3654f442e030f..91bedc6cfa820264629bfd81e38917c991a8d99e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ CC ?= clang
 CFLAGS = -MD -std=gnu99 -Wall -Wextra -pedantic-errors -g3
 LDFLAGS = -lm
 
-CSRCS = ast.c code.c conout.c fold.c ftepp.c hash.c intrin.c ir.c lexer.c main.c opts.c parser.c stat.c utf8.c util.c
-TSRCS = conout.c hash.c opts.c stat.c test.c util.c
-VSRCS = exec.c hash.c stat.c util.c
+CSRCS = ast.c code.c conout.c fold.c ftepp.c intrin.c ir.c lexer.c main.c opts.c parser.c stat.c utf8.c util.c
+TSRCS = conout.c opts.c stat.c test.c util.c
+VSRCS = exec.c stat.c util.c
 
 COBJS = $(CSRCS:.c=.o)
 TOBJS = $(TSRCS:.c=.o)

diff --git a/hash.c b/hash.c
deleted file mode 100644 (file)
index e11f28e..0000000
--- a/hash.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012, 2013, 2014, 2015
- *     Dale Weiler
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include <stddef.h>
-size_t hash(const char *string) {
-    size_t hash = 0;
-    for(; *string; ++string) {
-        hash += *string;
-        hash += (hash << 10);
-        hash ^= (hash >> 6);
-    }
-    hash += hash << 3;
-    hash ^= hash >> 11;
-    hash += hash << 15;
-    return hash;
-}

diff --git a/util.c b/util.c
index 10fd9f47b4c6a4af713039884e3e69df6f2071a4..02ac1a1247fdcb925f6db56a664add8c0fa5427e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -758,3 +758,16 @@ void util_seed(uint32_t value) {
         (void)util_rand();
 }
 
+size_t hash(const char *string) {
+    size_t hash = 0;
+    for(; *string; ++string) {
+        hash += *string;
+        hash += (hash << 10);
+        hash ^= (hash >> 6);
+    }
+    hash += hash << 3;
+    hash ^= hash >> 11;
+    hash += hash << 15;
+    return hash;
+}
+