X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=f26b02bbb2eb226f3db5ac548447c736eb88baa7;hb=75a3bc56e890a9ca5e25f194acbb574e942de5c5;hp=2609679629623e785318ad6c9bb36eb51302bf49;hpb=5d4f603fcfc7cf4a238b27de2b18567a733bb6b4;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2609679..f26b02b 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -678,15 +678,9 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 					case LOCALHOST:
 						str = mn->m_mbox;
 						break;
-					case UUCPHOST:
-						snprintf(buffer, sizeof(buffer), "%s!%s",
-							mn->m_host, mn->m_mbox);
-						str = buffer;
-						break;
 					default:
 						if (mn->m_mbox) {
-							snprintf(buffer, sizeof(buffer), "%s@%s",
-								mn->m_mbox, mn->m_host);
+							snprintf(buffer, sizeof(buffer), "%s@%s", mn->m_mbox, mn->m_host);
 							str= buffer;
 						} else
 							str = mn->m_text;
@@ -877,13 +871,14 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 		}
 		fmt++;
 	}
-#ifndef JLR
-	finished:;
+finished:;
 	if (cp[-1] != '\n')
 		*cp++ = '\n';
-	*cp   = 0;
+	*cp = '\0';
 	return ((struct format *)0);
-#else /* JLR */
+
+#ifdef JLR
+	/* I'll remove this as soon as I understand what it does. --meillo */
 	if (cp[-1] != '\n')
 		*cp++ = '\n';
 	while (fmt->f_type != FT_DONE)
@@ -892,6 +887,6 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 	finished:;
 	*cp = '\0';
 	return (fmt->f_value ? ++fmt : (struct format *) 0);
-
 #endif /* JLR */
+
 }