Release calc version 2.11.1

quickhash.c

@@ -1,33 +1,34 @@
-/*
- * Copyright (c) 1997 by Landon Curt Noll.  All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright, this permission notice and text
- * this comment, and the disclaimer below appear in all of the following:
- *
- *	supporting documentation
- *	source copies
- *	source works derived from this source
- *	binaries derived from this source or from derived source
- *
- * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- *	Landon Curt Noll
- *	http://reality.sgi.com/chongo/
- *
- *	chongo <was here> /\../\
- */
-
 /*
  * quickhash - quickly hash a calc value using a partial Fowler/Noll/Vo hash
  *
+ * Copyright (C) 1999  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 29.1 $
+ * @(#) $Id: quickhash.c,v 29.1 1999/12/14 09:16:14 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/quickhash.c,v $
+ *
+ * Under source code control:	1995/03/04 11:34:23
+ * File existed as early as:	1995
+ *
+ * chongo <was here> /\oo/\	http://reality.sgi.com/chongo/
+ * Share and enjoy!  :-)	http://reality.sgi.com/chongo/tech/comp/calc/
+ */
+
+/*
  * NOTE: This file does not contain a hash interface.  It is used by
  *	 associative arrays and other internal processes.
  *
@@ -52,6 +53,7 @@
  * for information on 32bit and 64bit Fowler/Noll/Vo hashs.
  */
 
+
 #include "value.h"
 #include "zrand.h"
 #include "zrandom.h"
@@ -292,7 +294,9 @@ objhash(OBJECT *op, QCKHASH val)
 {
 	int i;
 
-	i = op->o_actions->count;
+	val = fnv(op->o_actions->oa_index, val);
+
+	i = op->o_actions->oa_count;
 	while (--i >= 0)
 		val = hashvalue(&op->o_table[i], val);
 	return val;
@@ -407,10 +411,13 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->blkbase);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->blkfmt);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->calc_debug);
-	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->lib_debug);
+	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->resource_debug);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->user_debug);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->verbose_quit);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->ctrl_d);
+	/* program is handeled out of order */
+	/* basename is handeled out of order */
+	/* version is handeled out of order */
 
 	/*
 	 * hash the built up scalar
@@ -426,6 +433,15 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	if (cfg->prompt2) {
 		val = fnv_strhash(cfg->prompt2, val);
 	}
+	if (cfg->program) {
+		val = fnv_strhash(cfg->program, val);
+	}
+	if (cfg->basename) {
+		val = fnv_strhash(cfg->basename, val);
+	}
+	if (cfg->version) {
+		val = fnv_strhash(cfg->version, val);
+	}
 
 	/*
 	 * hash the epsilon if possible