X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhl.c;h=3d8ad8d9935d42e94ac065b1c0e4fb13b460130f;hp=4c2f06ee642026043e10a83f1add069c8845e78e;hb=43ea5347b6b445d926082d6e3c1ddec376e8692d;hpb=6b80b3bb772e2cf9186cf964bf78109b677e1bef

diff --git a/uip/mhl.c b/uip/mhl.c
index 4c2f06e..3d8ad8d 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -91,7 +91,7 @@ struct mcomp {
 	char *c_name;  /* component name */
 	char *c_text;  /* component text */
 	char *c_ovtxt; /* text overflow indicator */
-	char *c_nfs;   /* iff FORMAT */
+	char *c_fstr;   /* iff FORMAT */
 	struct format *c_fmt;  /*  .. */
 	int c_offset;  /* left margin indentation */
 	int c_ovoff;   /* overflow indentation */
@@ -444,7 +444,7 @@ mhl_format(char *file, int width)
 		ino = st.st_ino;
 	}
 
-	global.c_ovtxt = global.c_nfs = NULL;
+	global.c_ovtxt = global.c_fstr = NULL;
 	global.c_fmt = NULL;
 	global.c_offset = 0;
 	global.c_ovoff = -1;
@@ -516,13 +516,13 @@ mhl_format(char *file, int width)
 				if (evalvar(c1))
 					adios(NULL, "format file syntax error: %s", bp);
 			}
-			if (!c1->c_nfs && global.c_nfs) {
+			if (!c1->c_fstr && global.c_fstr) {
 				if ((c1->c_flags & DATEFMT) &&
 						(global.c_flags & DATEFMT)) {
-					c1->c_nfs = getcpy(global.c_nfs);
+					c1->c_fstr = getcpy(global.c_fstr);
 				} else if ((c1->c_flags & ADDRFMT) &&
 						(global.c_flags & ADDRFMT)) {
-					c1->c_nfs = getcpy(global.c_nfs);
+					c1->c_fstr = getcpy(global.c_fstr);
 				}
 			}
 			continue;
@@ -536,7 +536,7 @@ mhl_format(char *file, int width)
 	if (mhldebug) {
 		for (c1 = fmthd; c1; c1 = c1->c_next) {
 			fprintf(stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n", c1->c_name, c1->c_text, c1->c_ovtxt);
-			fprintf(stderr, "\tnfs=0x%x fmt=0x%x\n", (unsigned int)(unsigned long) c1->c_nfs, (unsigned int)(unsigned long) c1->c_fmt);
+			fprintf(stderr, "\tfstr=0x%x fmt=0x%x\n", (unsigned int)(unsigned long) c1->c_fstr, (unsigned int)(unsigned long) c1->c_fmt);
 			fprintf(stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d\n", c1->c_offset, c1->c_ovoff, c1->c_width, c1->c_cwidth);
 			fprintf (stderr, "\tflags=%s\n", snprintb(buffer, sizeof(buffer), (unsigned) c1->c_flags, LBITS));
 		}
@@ -571,23 +571,23 @@ evalvar(struct mcomp *c1)
 		return ptos(name, &c1->c_ovtxt);
 
 	if (!mh_strcasecmp(name, "formatfield")) {
-		char *nfs;
+		char *fmtstr;
 
 		if (ptos(name, &cp))
 			return 1;
 		cp = concat("=", cp, NULL);
-		nfs = new_fs(cp, NULL);
+		fmtstr = new_fs(cp, NULL);
 		free(cp);
-		c1->c_nfs = getcpy(nfs);
+		c1->c_fstr = getcpy(fmtstr);
 		c1->c_flags |= FORMAT;
 		return 0;
 	}
 
 	if (!mh_strcasecmp(name, "decode")) {
-		char *nfs;
+		char *fmtstr;
 
-		nfs = new_fs("=%(decode{text})", NULL);
-		c1->c_nfs = getcpy(nfs);
+		fmtstr = new_fs("=%(decode{text})", NULL);
+		c1->c_fstr = getcpy(fmtstr);
 		c1->c_flags |= FORMAT;
 		return 0;
 	}
@@ -895,7 +895,7 @@ mcomp_format(struct mcomp *c1, struct mcomp *c2)
 	dat[2] = 0;
 	dat[3] = sizeof(buffer) - 1;
 	dat[4] = 0;
-	fmt_compile(c1->c_nfs, &c1->c_fmt);
+	fmt_compile(c1->c_fstr, &c1->c_fmt);
 
 	if (!(c1->c_flags & ADDRFMT)) {
 		FINDCOMP(cptr, "text");
@@ -1003,8 +1003,8 @@ free_queue(struct mcomp **head, struct mcomp **tail)
 			free(c1->c_text);
 		if (c1->c_ovtxt)
 			free(c1->c_ovtxt);
-		if (c1->c_nfs)
-			free(c1->c_nfs);
+		if (c1->c_fstr)
+			free(c1->c_fstr);
 		if (c1->c_fmt)
 			free((char *) c1->c_fmt);
 		free((char *) c1);
@@ -1037,7 +1037,7 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag)
 		return;
 	}
 
-	if (c1->c_nfs && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT)))
+	if (c1->c_fstr && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT)))
 		mcomp_format(c1, c2);
 
 	if (c1->c_flags & CENTER) {