quote: Change the definition of escp

Semi-arbitrary change of the definition of escp to the beginning of
the argument sequence instead of the initiator character.  This may
avoid an add in some code paths, and looks slightly cleaner to me.

1 files changed, 7 insertions, 7 deletions

diff --git a/quote.c b/quote.c
index d7a8dd7..6bfded3 100644
--- a/quote.c
+++ b/quote.c
@@ -232,7 +232,7 @@ size_t nasm_unquote(char *str)
 
 	    case st_backslash:
 		state = st_start;
-		escp = p-1;
+		escp = p;	/* Beginning of argument sequence */
 		nval = 0;
 		switch (c) {
 		case 'a':
@@ -315,7 +315,7 @@ size_t nasm_unquote(char *str)
 		    }
 		} else {
 		    p--;	/* Process this character again */
-		    *q++ = (p > escp+1) ? nval : *escp;
+		    *q++ = (p > escp) ? nval : escp[-1];
 		    state = st_start;
 		}
 		break;
@@ -331,10 +331,10 @@ size_t nasm_unquote(char *str)
 		    }
 		} else {
 		    p--;	/* Process this character again */
-		    if (p > escp+1)
+		    if (p > escp)
 			q = emit_utf8(q, nval);
 		    else
-			*q++ = *escp;
+			*q++ = escp[-1];
 		    state = st_start;
 		}
 		break;
@@ -348,13 +348,13 @@ size_t nasm_unquote(char *str)
 	    *q++ = nval;
 	    break;
 	case st_hex:
-	    *q++ = (p > escp+1) ? nval : *escp;
+	    *q++ = (p > escp) ? nval : escp[-1];
 	    break;
 	case st_ucs:
-	    if (p > escp+1)
+	    if (p > escp)
 		q = emit_utf8(q, nval);
 	    else
-		*q++ = *escp;
+		*q++ = escp[-1];
 	    break;
 	}
 	*q = '\0';