From 0e4defe03219961558bce49dac3b9d40c1029872 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Tue, 30 Jun 1987 18:59:51 +0000
Subject: [PATCH] again, more consistent naming

---
 modules/src/read_em/mkcalls.c |  6 +++---
 modules/src/read_em/read_em.c |  2 +-
 modules/src/read_em/reade.c   | 32 ++++++++++++++---------------
 modules/src/read_em/readk.c   | 38 +++++++++++++++++------------------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/modules/src/read_em/mkcalls.c b/modules/src/read_em/mkcalls.c
index de36a2739..2e6fc5c95 100644
--- a/modules/src/read_em/mkcalls.c
+++ b/modules/src/read_em/mkcalls.c
@@ -38,8 +38,8 @@ checkarg(arg, typset)
 	register struct e_arg *arg;
 {
 
-	if (((!typset) && arg->ems_argtype) ||
-	    ((!arg->ems_argtype) && typset)) {
+	if (((!typset) && arg->ema_argtype) ||
+	    ((!arg->ema_argtype) && typset)) {
 		/* End of arguments expected, but there are more, or
 		   an argument expected, but there is none
 		*/
@@ -47,7 +47,7 @@ checkarg(arg, typset)
 		return;
 	}
 
-	if (!(arg->ems_argtype & typset)) {
+	if (!(arg->ema_argtype & typset)) {
 		/* Type error */
 		EM_error = "Illegal parameter type";
 	}
diff --git a/modules/src/read_em/read_em.c b/modules/src/read_em/read_em.c
index 81a73c45e..a28b214e5 100644
--- a/modules/src/read_em/read_em.c
+++ b/modules/src/read_em/read_em.c
@@ -352,7 +352,7 @@ EM_getinstr(p)
 			case ps_pro:
 				getarg(pro_ptyp, &(p->em_arg));
 				getarg(cst_ptyp|ptyp(sp_cend), &dummy);
-				if (dummy.ems_argtype == 0) {
+				if (dummy.ema_argtype == 0) {
 					p->em_nlocals = -1;
 				}
 				else	p->em_nlocals = dummy.ema_cst;
diff --git a/modules/src/read_em/reade.c b/modules/src/read_em/reade.c
index 5170ad962..feedf74fa 100644
--- a/modules/src/read_em/reade.c
+++ b/modules/src/read_em/reade.c
@@ -274,7 +274,7 @@ getnumber(c, ap)
 	int expsign;
 	long str2long();
 
-	ap->ems_argtype = cst_ptyp;
+	ap->ema_argtype = cst_ptyp;
 	expsign = 0;
 
 	if (c == '+' || c == '-') {
@@ -328,17 +328,17 @@ getnumber(c, ap)
 		strcpy(string.str, str);
 		ap->ema_string = string.str;
 		gettyp(cst_ptyp, &dummy);
-		ap->ems_szoroff = dummy.ema_cst;
+		ap->ema_szoroff = dummy.ema_cst;
 
 		switch(c) {
 		case 'I':
-			ap->ems_argtype = ico_ptyp;
+			ap->ema_argtype = ico_ptyp;
 			return sp_icon;
 		case 'U':
-			ap->ems_argtype = uco_ptyp;
+			ap->ema_argtype = uco_ptyp;
 			return sp_ucon;
 		case 'F':
-			ap->ems_argtype = fco_ptyp;
+			ap->ema_argtype = fco_ptyp;
 			return sp_fcon;
 		}
 		assert(0);
@@ -457,25 +457,25 @@ gettyp(typset, ap)
 		out("name\n");
 		ungetbyte(c);
 		ap->ema_dnam = getname()->str;
-		ap->ems_argtype = sof_ptyp;
-		argtyp = offsetted(sp_dnam, &(ap->ems_szoroff));
+		ap->ema_argtype = sof_ptyp;
+		argtyp = offsetted(sp_dnam, &(ap->ema_szoroff));
 	}
 	else if (c == '.') {
 		out(".label\n");
 		ap->ema_dlb = get15u();
-		ap->ems_argtype = nof_ptyp;
-		argtyp = offsetted(sp_dlb2, &(ap->ems_szoroff));
+		ap->ema_argtype = nof_ptyp;
+		argtyp = offsetted(sp_dlb2, &(ap->ema_szoroff));
 	}
 	else if (c == '*') {
 		out("*label\n");
 		ap->ema_ilb = get15u();
-		ap->ems_argtype = ilb_ptyp;
+		ap->ema_argtype = ilb_ptyp;
 		argtyp = sp_ilb2;
 	}
 	else if (c == '$') {
 		out("$name\n");
 		ap->ema_pnam = getname()->str;
-		ap->ems_argtype = pro_ptyp;
+		ap->ema_argtype = pro_ptyp;
 		argtyp = sp_pnam;
 	}
 	else if (c == '"' || c == '\'') {
@@ -485,14 +485,14 @@ gettyp(typset, ap)
 		ungetbyte(c);
 		s = getstring(0);
 		ap->ema_string = s->str;
-		ap->ems_szoroff = s->length;	
-		ap->ems_argtype = str_ptyp;
+		ap->ema_szoroff = s->length;	
+		ap->ema_argtype = str_ptyp;
 		argtyp = sp_scon;
 	}
 	else if (c == '?') {
 		out("?\n");
 		argtyp = sp_cend;
-		ap->ems_argtype = 0;
+		ap->ema_argtype = 0;
 	}
 	else {
 		/* c != '\n', so "ungetbyte" not neccesary */
@@ -508,7 +508,7 @@ gettyp(typset, ap)
 	}
 
 	if (argtyp == sp_cend) {
-		ap->ems_argtype = 0;
+		ap->ema_argtype = 0;
 	}
 	return;
 }
@@ -587,7 +587,7 @@ line_line()
 	gettyp(ptyp(sp_cst2), &dummy);
 	EM_lineno = dummy.ema_cst;
 	gettyp(str_ptyp, &dummy);
-	btscpy(filebuf, dummy.ema_string, (int) dummy.ems_szoroff);
+	btscpy(filebuf, dummy.ema_string, (int) dummy.ema_szoroff);
 	EM_filename = filebuf;
 }
 
diff --git a/modules/src/read_em/readk.c b/modules/src/read_em/readk.c
index 161f72331..dfb02258c 100644
--- a/modules/src/read_em/readk.c
+++ b/modules/src/read_em/readk.c
@@ -54,21 +54,21 @@ getarg(typset, ap)
 	default:
 		if (i < sp_fcst0+sp_ncst0 && i >= sp_fcst0) { /* A cst */
 			ap->ema_cst = i - sp_zcst0;
-			ap->ems_argtype = cst_ptyp;
+			ap->ema_argtype = cst_ptyp;
 			i = sp_cst2;
 		}
 		break;
 
 	case sp_dlb1:	/* Numeric data label encoded in one byte */
 		ap->ema_dlb = getbyte();
-		ap->ems_szoroff = 0;
-		ap->ems_argtype = nof_ptyp;
+		ap->ema_szoroff = 0;
+		ap->ema_argtype = nof_ptyp;
 		break;
 
 	case sp_dlb2:	/* Numeric data label encoded in two bytes */
 		ap->ema_dlb = get16();
-		ap->ems_szoroff = 0;
-		ap->ems_argtype = nof_ptyp;
+		ap->ema_szoroff = 0;
+		ap->ema_argtype = nof_ptyp;
 #ifdef CHECKING
 		if (ap->ema_dlb > 32767 && !EM_error) {
 			EM_error = "Illegal data label";
@@ -79,12 +79,12 @@ getarg(typset, ap)
 
 	case sp_ilb1:	/* Instruction label encoded in one byte */
 		ap->ema_ilb = getbyte();
-		ap->ems_argtype = ilb_ptyp;
+		ap->ema_argtype = ilb_ptyp;
 		break;
 
 	case sp_ilb2:	/* Instruction label encoded in two bytes */
 		ap->ema_ilb = get16();
-		ap->ems_argtype = ilb_ptyp;
+		ap->ema_argtype = ilb_ptyp;
 #ifdef CHECKING
 		if (ap->ema_ilb > 32767 && !EM_error) {
 			EM_error = "Illegal instruction label";
@@ -95,12 +95,12 @@ getarg(typset, ap)
 
 	case sp_cst2:	/* A cst encoded in two bytes */
 		ap->ema_cst = get16();
-		ap->ems_argtype = cst_ptyp;
+		ap->ema_argtype = cst_ptyp;
 		break;
 
 	case sp_cst4:	/* A cst encoded in four bytes */
 		ap->ema_cst = get32();
-		ap->ems_argtype = cst_ptyp;
+		ap->ema_argtype = cst_ptyp;
 		break;
 
 	case sp_pnam:	/* A procedure name */
@@ -114,7 +114,7 @@ getarg(typset, ap)
 		}
 #endif CHECKING
 		ap->ema_pnam = p->str;
-		ap->ems_argtype = pro_ptyp;
+		ap->ema_argtype = pro_ptyp;
 		break;
 	}
 
@@ -129,8 +129,8 @@ getarg(typset, ap)
 		}
 #endif CHECKING
 		ap->ema_dnam = p->str;
-		ap->ems_szoroff = 0;
-		ap->ems_argtype = sof_ptyp;
+		ap->ema_szoroff = 0;
+		ap->ema_argtype = sof_ptyp;
 		break;
 	}
 
@@ -140,7 +140,7 @@ getarg(typset, ap)
 
 		getarg(lab_ptyp, ap);
 		getarg(cst_ptyp, &dummy);
-		ap->ems_szoroff = dummy.ema_cst;
+		ap->ema_szoroff = dummy.ema_cst;
 		break;
 	}
 
@@ -151,14 +151,14 @@ getarg(typset, ap)
 		register struct string *p;
 
 		getarg(cst_ptyp, ap);
-		ap->ems_szoroff = ap->ema_cst;
+		ap->ema_szoroff = ap->ema_cst;
 		p = getstring(0);
 #ifdef CHECKING
 		if (state & INSTRING) {
 			xerror("Numeric constant too long");
 		}
 #endif CHECKING
-		ap->ems_argtype = ptyp(i);
+		ap->ema_argtype = ptyp(i);
 		ap->ema_string = p->str;
 		break;
 	}
@@ -168,9 +168,9 @@ getarg(typset, ap)
 		register struct string *p;
 
 		p = getstring(0);
-		ap->ems_argtype = str_ptyp;
+		ap->ema_argtype = str_ptyp;
 		ap->ema_string = p->str;
-		ap->ems_szoroff = p->length;
+		ap->ema_szoroff = p->length;
 		break;
 	}
 	}
@@ -192,11 +192,11 @@ getarg(typset, ap)
 		EM_error = "Bad argument type";
 	}
 	if (argtyp == sp_cend) {
-		ap->ems_argtype = 0;
+		ap->ema_argtype = 0;
 	}
 #else not CHECKING
 	if (i == sp_cend) {
-		ap->ems_argtype = 0;
+		ap->ema_argtype = 0;
 	}
 #endif CHECKING
 }