From 52c04137b047c0eb24895206d7cb49345e81ddd3 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Sun, 6 Sep 2020 12:22:50 -0700
Subject: [PATCH] Remove unnecessary struct definition for SX hash arguments.

	modified:   inc/sxhashdefs.h
	modified:   src/miscn.c
	modified:   src/sxhash.c
---
 inc/sxhashdefs.h |  7 +++----
 src/miscn.c      |  6 +++---
 src/sxhash.c     | 12 ++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/inc/sxhashdefs.h b/inc/sxhashdefs.h
index 4cf5b77..42c1ecf 100644
--- a/inc/sxhashdefs.h
+++ b/inc/sxhashdefs.h
@@ -1,7 +1,6 @@
 #ifndef SXHASHDEFS_H
 #define SXHASHDEFS_H 1
-typedef struct { LispPTR object; } SXHASHARG;
-LispPTR SX_hash(register SXHASHARG *args);
-LispPTR STRING_EQUAL_HASHBITS(SXHASHARG *args);
-LispPTR STRING_HASHBITS(SXHASHARG *args);
+LispPTR SX_hash(LispPTR object);
+LispPTR STRING_EQUAL_HASHBITS(LispPTR object);
+LispPTR STRING_HASHBITS(LispPTR object);
 #endif
diff --git a/src/miscn.c b/src/miscn.c
index e362c87..591fa82 100644
--- a/src/miscn.c
+++ b/src/miscn.c
@@ -72,11 +72,11 @@ int OP_miscn(int misc_index, int arg_count) {
       N_GETNUMBER(args[0], user_subr, do_ufn);
       if ((result = UserSubr(user_subr, arg_count - 1, &args[1])) < 0) goto do_ufn;
     } break;
-    case miscn_SXHASH: result = SX_hash(args); break;
+    case miscn_SXHASH: result = SX_hash(args[0]); break;
 
-    case miscn_STRING_EQUAL_HASHBITS: result = STRING_EQUAL_HASHBITS(args); break;
+    case miscn_STRING_EQUAL_HASHBITS: result = STRING_EQUAL_HASHBITS(args[0]); break;
 
-    case miscn_STRINGHASHBITS: result = STRING_HASHBITS(args); break;
+    case miscn_STRINGHASHBITS: result = STRING_HASHBITS(args[0]); break;
 
     case miscn_VALUES:
       if (arg_count > 255) {
diff --git a/src/sxhash.c b/src/sxhash.c
index c9900cd..f8b6e1b 100644
--- a/src/sxhash.c
+++ b/src/sxhash.c
@@ -50,8 +50,8 @@ static unsigned short stringhash(LispPTR obj);
 /*								*/
 /****************************************************************/
 
-LispPTR SX_hash(register SXHASHARG *args) {
-  return (S_POSITIVE | (0xFFFF & (sxhash(args->object))));
+LispPTR SX_hash(LispPTR object) {
+    return (S_POSITIVE | (0xFFFF & (sxhash(object))));
   /* Smash the top of the stack to a 0xe, offset */
 }
 
@@ -194,8 +194,8 @@ static unsigned short sxhash_pathname(LispPTR obj) {
 /* 								*/
 /****************************************************************/
 
-LispPTR STRING_EQUAL_HASHBITS(SXHASHARG *args) {
-  return (S_POSITIVE | (0xFFFF & (stringequalhash(args->object))));
+LispPTR STRING_EQUAL_HASHBITS(LispPTR object) {
+  return (S_POSITIVE | (0xFFFF & (stringequalhash(object))));
 } /* STRING_EQUAL_HASHBITS */
 
 static unsigned short stringequalhash(LispPTR obj) {
@@ -262,8 +262,8 @@ static unsigned short stringequalhash(LispPTR obj) {
 /* 								*/
 /****************************************************************/
 
-LispPTR STRING_HASHBITS(SXHASHARG *args) {
-  return (S_POSITIVE | (0xFFFF & (stringhash(args->object))));
+LispPTR STRING_HASHBITS(LispPTR object) {
+  return (S_POSITIVE | (0xFFFF & (stringhash(object))));
 } /* STRING_HASHBITS */
 
 static unsigned short stringhash(LispPTR obj) {