Minor cleanup; remove duplication of names.c

1 files changed, 3 insertions, 3 deletions

diff --git a/stdscan.c b/stdscan.c
index 4a5f296d..d4ad696d 100644
--- a/stdscan.c
+++ b/stdscan.c
@@ -74,8 +74,8 @@ int stdscan(void *private_data, struct tokenval *tv)
     if (isidstart(*stdscan_bufptr) ||
         (*stdscan_bufptr == '$' && isidstart(stdscan_bufptr[1]))) {
         /* now we've got an identifier */
-        uint32_t i;
         int is_sym = FALSE;
+	int t;
 
         if (*stdscan_bufptr == '$') {
             is_sym = TRUE;
@@ -99,8 +99,8 @@ int stdscan(void *private_data, struct tokenval *tv)
         *r = '\0';
         /* right, so we have an identifier sitting in temp storage. now,
          * is it actually a register or instruction name, or what? */
-	if (nasm_token_hash(ourcopy, tv) != -1)
-	    return tv->t_type;
+	if ((t = nasm_token_hash(ourcopy, tv)) != -1)
+	    return t;
 	else
 	    return tv->t_type = TOKEN_ID;
     } else if (*stdscan_bufptr == '$' && !isnumchar(stdscan_bufptr[1])) {