From: Peter Johnson <peter@tortall.net>
Date: Sun, 17 Mar 2002 06:03:36 +0000 (-0000)
Subject: Don't block global src variable.  While I'm here, change to use SLIST_FOREACH.
X-Git-Tag: v0.1.0~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18ff2cc4f56773cdddac6f7a854e2f626b5101d2;p=yasm

Don't block global src variable.  While I'm here, change to use SLIST_FOREACH.

svn path=/trunk/yasm/; revision=515
---

diff --git a/modules/preprocs/yapp/yapp-preproc.c b/modules/preprocs/yapp/yapp-preproc.c
index f38ca022..955eb511 100644
--- a/modules/preprocs/yapp/yapp-preproc.c
+++ b/modules/preprocs/yapp/yapp-preproc.c
@@ -408,23 +408,21 @@ expand_macro(YAPP_Macro *ym)
 
     if (ym->type == YAPP_DEFINE) {
 	if (ym->args == -1) {
-	    source *src;
+	    source *mac;
 	    /* no parens to deal with */
-	    src = SLIST_FIRST(&ym->macro_head);
-	    while (src != NULL) {
-		if (src->token.type == IDENT) {
-		    YAPP_Macro *imacro = yapp_macro_get(src->token.str);
+	    SLIST_FOREACH (mac, &ym->macro_head, next) {
+		if (mac->token.type == IDENT) {
+		    YAPP_Macro *imacro = yapp_macro_get(mac->token.str);
 		    if (imacro != NULL && !imacro->expanding) {
 			expand_macro(imacro);
 		    }
 		    else {
-			copy_token(&src->token);
+			copy_token(&mac->token);
 		    }
 		}
 		else {
-		    copy_token(&src->token);
+		    copy_token(&mac->token);
 		}
-		src = SLIST_NEXT(src, next);
 	    }
 	}
 	else
diff --git a/src/preprocs/yapp/yapp-preproc.c b/src/preprocs/yapp/yapp-preproc.c
index f38ca022..955eb511 100644
--- a/src/preprocs/yapp/yapp-preproc.c
+++ b/src/preprocs/yapp/yapp-preproc.c
@@ -408,23 +408,21 @@ expand_macro(YAPP_Macro *ym)
 
     if (ym->type == YAPP_DEFINE) {
 	if (ym->args == -1) {
-	    source *src;
+	    source *mac;
 	    /* no parens to deal with */
-	    src = SLIST_FIRST(&ym->macro_head);
-	    while (src != NULL) {
-		if (src->token.type == IDENT) {
-		    YAPP_Macro *imacro = yapp_macro_get(src->token.str);
+	    SLIST_FOREACH (mac, &ym->macro_head, next) {
+		if (mac->token.type == IDENT) {
+		    YAPP_Macro *imacro = yapp_macro_get(mac->token.str);
 		    if (imacro != NULL && !imacro->expanding) {
 			expand_macro(imacro);
 		    }
 		    else {
-			copy_token(&src->token);
+			copy_token(&mac->token);
 		    }
 		}
 		else {
-		    copy_token(&src->token);
+		    copy_token(&mac->token);
 		}
-		src = SLIST_NEXT(src, next);
 	    }
 	}
 	else