Minor rename/cleanup

git-svn-id: file:///svnroot/mailfromd/trunk@1473 7a8a7f39-df28-0410-adc6-e0d955640f24
author: Sergey Poznyakoff <gray@gnu.org.ua> 2007-05-24 19:03:54 +0000
committer: Sergey Poznyakoff <gray@gnu.org.ua> 2007-05-24 19:03:54 +0000
commit: f5e8d9e76cd34e13b98dfd7b762d48dfc1b7bdc0 (patch)
tree: cbd29e658e075470df5e4138a8f943345dfd532c
parent: 63b6aec5433e9610e0b701cf608d234b798a290f (diff)
download: mailfromd-f5e8d9e76cd34e13b98dfd7b762d48dfc1b7bdc0.tar.gz
mailfromd-f5e8d9e76cd34e13b98dfd7b762d48dfc1b7bdc0.tar.bz2
6 files changed, 49 insertions, 54 deletions
diff --git a/src/bi_dns.m4 b/src/bi_dns.m4
index c1cad4cd..7effbc03 100644
--- a/src/bi_dns.m4
+++ b/src/bi_dns.m4
@@ -81,7 +81,7 @@ MF_DEFUN(dns_getaddr, STRING, STRING string)
                          &ttl, NULL, 0);
        switch (dnstat) {
        case dns_success: {
-                MF_BEGIN_TEMP_SPACE();
+                MF_OBSTACK_BEGIN();
                qsort(ipbuf, ipcount, sizeof ipbuf[0], ipaddr_cmp);
                for (i = 0; i < ipcount; i++) {
                        struct in_addr addr;
@@ -90,11 +90,11 @@ MF_DEFUN(dns_getaddr, STRING, STRING string)
                        addr.s_addr = ipbuf[i];
                        q = inet_ntoa(addr);
                        if (i > 0)
-                                MF_1GROW_TEMP_SPACE(' ');
+                                MF_OBSTACK_1GROW(' ');
-                        MF_GROW_TEMP_SPACE(q);
+                        MF_OBSTACK_GROW(q);
                }
-                MF_1GROW_TEMP_SPACE(0);
+                MF_OBSTACK_1GROW(0);
-                MF_RETURN_TEMP_SPACE();
+                MF_RETURN_OBSTACK();
        }
        case dns_not_found:
                MF_RETURN_STRING("");
@@ -135,15 +135,15 @@ MF_DEFUN(dns_getname, STRING, STRING ipstr)
                for (i = 0; i < ncount; i++) {
                        if (i > 0)
-                                MF_1GROW_TEMP_SPACE(' ');
+                                MF_OBSTACK_1GROW(' ');
-                        MF_GROW_TEMP_SPACE(names[i]);
+                        MF_OBSTACK_GROW(names[i]);
                }
-                MF_1GROW_TEMP_SPACE(0);
+                MF_OBSTACK_1GROW(0);
                for (; i < ncount; i++) 
                        free(names[i]);
-                MF_RETURN_TEMP_SPACE();
+                MF_RETURN_OBSTACK();
        }
        case dns_not_found:
                MF_RETURN_STRING("");
@@ -191,15 +191,15 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER resolve)
        else {
                int i;
                
-                MF_BEGIN_TEMP_SPACE();
+                MF_OBSTACK_BEGIN();
                for (i = 0; i < MAXMXCOUNT && mxbuf[i]; i++) {
                        if (i > 0)
-                                MF_1GROW_TEMP_SPACE(' ');
+                                MF_OBSTACK_1GROW(' ');
-                        MF_GROW_TEMP_SPACE(mxbuf[i]);
+                        MF_OBSTACK_GROW(mxbuf[i]);
                }
-                MF_1GROW_TEMP_SPACE(0);
+                MF_OBSTACK_1GROW(0);
                dns_freemx(mxbuf);
-                MF_RETURN_TEMP_SPACE();
+                MF_RETURN_OBSTACK();
        }
 }
 END
diff --git a/src/bi_sprintf.m4 b/src/bi_sprintf.m4
index 453831d1..f25e33c0 100644
--- a/src/bi_sprintf.m4
+++ b/src/bi_sprintf.m4
@@ -59,7 +59,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
        unsigned prec = 0;
        unsigned argnum;
-        MF_BEGIN_TEMP_SPACE();
+        MF_OBSTACK_BEGIN();
        MF_VA_START();
        while (*p) {
                unsigned n;
@@ -78,14 +78,14 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                width = 0;
                                prec = 0;
                        } else
-                                MF_1GROW_TEMP_SPACE(*p);
+                                MF_OBSTACK_1GROW(*p);
                        p++;
                        break;
                                
                case fmts_pos:
                        /* Expect '%' or an argument position -- %_% or %_2$ */
                        if (*p == '%') {
-                                MF_1GROW_TEMP_SPACE('%');
+                                MF_OBSTACK_1GROW('%');
                                p++;
                                state = fmts_copy;
                                break;
@@ -232,7 +232,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                        str = q;
                                        n = width;
                                }
-                                MF_GROW_TEMP_SPACE(str, n);
+                                MF_OBSTACK_GROW(str, n);
                                break;
                        case 'i':
@@ -272,7 +272,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                if (width && width > n) {
                                        char *q;
-                                        MF_GROW_TEMP_SPACE(NULL, width, q);
+                                        MF_OBSTACK_GROW(NULL, width, q);
                                        memset(q,
                                               (flags & FMT_PADZERO) ?
                                                 '0' : ' ',
@@ -288,7 +288,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                                memcpy(q + width - n, str, n);
                                        }
                                } else
-                                        MF_GROW_TEMP_SPACE(str, n);
+                                        MF_OBSTACK_GROW(str, n);
                                break;
                        case 'u':
@@ -310,7 +310,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                
                                if (width && width > n) {
                                        char *q;
-                                        MF_GROW_TEMP_SPACE(NULL, width, q);
+                                        MF_OBSTACK_GROW(NULL, width, q);
                                        memset(q,
                                               (flags & FMT_PADZERO) ?
                                                 '0' : ' ',
@@ -320,7 +320,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                        else 
                                                memcpy(q + width - n, str, n);
                                } else
-                                        MF_GROW_TEMP_SPACE(str, n);
+                                        MF_OBSTACK_GROW(str, n);
                                break;
                        case 'x':
@@ -350,7 +350,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                
                                if (width && width > n) {
                                        char *q;
-                                        MF_GROW_TEMP_SPACE(NULL, width, q);
+                                        MF_OBSTACK_GROW(NULL, width, q);
                                        memset(q,
                                               (flags & FMT_PADZERO) ?
                                                 '0' : ' ',
@@ -367,7 +367,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                                memcpy(q + width - n, str, n);
                                        }
                                } else
-                                        MF_GROW_TEMP_SPACE(str, n);
+                                        MF_OBSTACK_GROW(str, n);
                                break;
                                
                        case 'o':
@@ -393,7 +393,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                
                                if (width && width > n) {
                                        char *q;
-                                        MF_GROW_TEMP_SPACE(NULL, width, q);
+                                        MF_OBSTACK_GROW(NULL, width, q);
author	Sergey Poznyakoff <gray@gnu.org.ua>	2007-05-24 19:03:54 +0000
committer	Sergey Poznyakoff <gray@gnu.org.ua>	2007-05-24 19:03:54 +0000
commit	f5e8d9e76cd34e13b98dfd7b762d48dfc1b7bdc0 (patch)
tree	cbd29e658e075470df5e4138a8f943345dfd532c
parent	63b6aec5433e9610e0b701cf608d234b798a290f (diff)
download	mailfromd-f5e8d9e76cd34e13b98dfd7b762d48dfc1b7bdc0.tar.gz mailfromd-f5e8d9e76cd34e13b98dfd7b762d48dfc1b7bdc0.tar.bz2

diff --git a/src/bi_dns.m4 b/src/bi_dns.m4 index c1cad4cd..7effbc03 100644 --- a/src/bi_dns.m4 +++ b/src/bi_dns.m4
@@ -81,7 +81,7 @@ MF_DEFUN(dns_getaddr, STRING, STRING string)
81	&ttl, NULL, 0);	81	&ttl, NULL, 0);
82	switch (dnstat) {	82	switch (dnstat) {
83	case dns_success: {	83	case dns_success: {
84	MF_BEGIN_TEMP_SPACE();	84	MF_OBSTACK_BEGIN();
85	qsort(ipbuf, ipcount, sizeof ipbuf[0], ipaddr_cmp);	85	qsort(ipbuf, ipcount, sizeof ipbuf[0], ipaddr_cmp);
86	for (i = 0; i < ipcount; i++) {	86	for (i = 0; i < ipcount; i++) {
87	struct in_addr addr;	87	struct in_addr addr;
@@ -90,11 +90,11 @@ MF_DEFUN(dns_getaddr, STRING, STRING string)
90	addr.s_addr = ipbuf[i];	90	addr.s_addr = ipbuf[i];
91	q = inet_ntoa(addr);	91	q = inet_ntoa(addr);
92	if (i > 0)	92	if (i > 0)
93	MF_1GROW_TEMP_SPACE(' ');	93	MF_OBSTACK_1GROW(' ');
94	MF_GROW_TEMP_SPACE(q);	94	MF_OBSTACK_GROW(q);
95	}	95	}
96	MF_1GROW_TEMP_SPACE(0);	96	MF_OBSTACK_1GROW(0);
97	MF_RETURN_TEMP_SPACE();	97	MF_RETURN_OBSTACK();
98	}	98	}
99	case dns_not_found:	99	case dns_not_found:
100	MF_RETURN_STRING("");	100	MF_RETURN_STRING("");
@@ -135,15 +135,15 @@ MF_DEFUN(dns_getname, STRING, STRING ipstr)
135		135
136	for (i = 0; i < ncount; i++) {	136	for (i = 0; i < ncount; i++) {
137	if (i > 0)	137	if (i > 0)
138	MF_1GROW_TEMP_SPACE(' ');	138	MF_OBSTACK_1GROW(' ');
139	MF_GROW_TEMP_SPACE(names[i]);	139	MF_OBSTACK_GROW(names[i]);
140	}	140	}
141	MF_1GROW_TEMP_SPACE(0);	141	MF_OBSTACK_1GROW(0);
142		142
143	for (; i < ncount; i++)	143	for (; i < ncount; i++)
144	free(names[i]);	144	free(names[i]);
145		145
146	MF_RETURN_TEMP_SPACE();	146	MF_RETURN_OBSTACK();
147	}	147	}
148	case dns_not_found:	148	case dns_not_found:
149	MF_RETURN_STRING("");	149	MF_RETURN_STRING("");
@@ -191,15 +191,15 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER resolve)
191	else {	191	else {
192	int i;	192	int i;
193		193
194	MF_BEGIN_TEMP_SPACE();	194	MF_OBSTACK_BEGIN();
195	for (i = 0; i < MAXMXCOUNT && mxbuf[i]; i++) {	195	for (i = 0; i < MAXMXCOUNT && mxbuf[i]; i++) {
196	if (i > 0)	196	if (i > 0)
197	MF_1GROW_TEMP_SPACE(' ');	197	MF_OBSTACK_1GROW(' ');
198	MF_GROW_TEMP_SPACE(mxbuf[i]);	198	MF_OBSTACK_GROW(mxbuf[i]);
199	}	199	}
200	MF_1GROW_TEMP_SPACE(0);	200	MF_OBSTACK_1GROW(0);
201	dns_freemx(mxbuf);	201	dns_freemx(mxbuf);
202	MF_RETURN_TEMP_SPACE();	202	MF_RETURN_OBSTACK();
203	}	203	}
204	}	204	}
205	END	205	END


diff --git a/src/bi_sprintf.m4 b/src/bi_sprintf.m4 index 453831d1..f25e33c0 100644 --- a/src/bi_sprintf.m4 +++ b/src/bi_sprintf.m4
@@ -59,7 +59,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
59	unsigned prec = 0;	59	unsigned prec = 0;
60	unsigned argnum;	60	unsigned argnum;
61		61
62	MF_BEGIN_TEMP_SPACE();	62	MF_OBSTACK_BEGIN();
63	MF_VA_START();	63	MF_VA_START();
64	while (*p) {	64	while (*p) {
65	unsigned n;	65	unsigned n;
@@ -78,14 +78,14 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
78	width = 0;	78	width = 0;
79	prec = 0;	79	prec = 0;
80	} else	80	} else
81	MF_1GROW_TEMP_SPACE(*p);	81	MF_OBSTACK_1GROW(*p);
82	p++;	82	p++;
83	break;	83	break;
84		84
85	case fmts_pos:	85	case fmts_pos:
86	/* Expect '%' or an argument position -- %_% or %_2$ */	86	/* Expect '%' or an argument position -- %_% or %_2$ */
87	if (*p == '%') {	87	if (*p == '%') {
88	MF_1GROW_TEMP_SPACE('%');	88	MF_OBSTACK_1GROW('%');
89	p++;	89	p++;
90	state = fmts_copy;	90	state = fmts_copy;
91	break;	91	break;
@@ -232,7 +232,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
232	str = q;	232	str = q;
233	n = width;	233	n = width;
234	}	234	}
235	MF_GROW_TEMP_SPACE(str, n);	235	MF_OBSTACK_GROW(str, n);
236	break;	236	break;
237		237
238	case 'i':	238	case 'i':
@@ -272,7 +272,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
272		272
273	if (width && width > n) {	273	if (width && width > n) {
274	char *q;	274	char *q;
275	MF_GROW_TEMP_SPACE(NULL, width, q);	275	MF_OBSTACK_GROW(NULL, width, q);
276	memset(q,	276	memset(q,
277	(flags & FMT_PADZERO) ?	277	(flags & FMT_PADZERO) ?
278	'0' : ' ',	278	'0' : ' ',
@@ -288,7 +288,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
288	memcpy(q + width - n, str, n);	288	memcpy(q + width - n, str, n);
289	}	289	}
290	} else	290	} else
291	MF_GROW_TEMP_SPACE(str, n);	291	MF_OBSTACK_GROW(str, n);
292	break;	292	break;
293		293
294	case 'u':	294	case 'u':
@@ -310,7 +310,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
310		310
311	if (width && width > n) {	311	if (width && width > n) {
312	char *q;	312	char *q;
313	MF_GROW_TEMP_SPACE(NULL, width, q);	313	MF_OBSTACK_GROW(NULL, width, q);
314	memset(q,	314	memset(q,
315	(flags & FMT_PADZERO) ?	315	(flags & FMT_PADZERO) ?
316	'0' : ' ',	316	'0' : ' ',
@@ -320,7 +320,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
320	else	320	else
321	memcpy(q + width - n, str, n);	321	memcpy(q + width - n, str, n);
322	} else	322	} else
323	MF_GROW_TEMP_SPACE(str, n);	323	MF_OBSTACK_GROW(str, n);
324	break;	324	break;
325		325
326	case 'x':	326	case 'x':
@@ -350,7 +350,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
350		350
351	if (width && width > n) {	351	if (width && width > n) {
352	char *q;	352	char *q;
353	MF_GROW_TEMP_SPACE(NULL, width, q);	353	MF_OBSTACK_GROW(NULL, width, q);
354	memset(q,	354	memset(q,
355	(flags & FMT_PADZERO) ?	355	(flags & FMT_PADZERO) ?
356	'0' : ' ',	356	'0' : ' ',
@@ -367,7 +367,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
367	memcpy(q + width - n, str, n);	367	memcpy(q + width - n, str, n);
368	}	368	}
369	} else	369	} else
370	MF_GROW_TEMP_SPACE(str, n);	370	MF_OBSTACK_GROW(str, n);
371	break;	371	break;
372		372
373	case 'o':	373	case 'o':
@@ -393,7 +393,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
393		393
394	if (width && width > n) {	394	if (width && width > n) {
395	char *q;	395	char *q;
396	MF_GROW_TEMP_SPACE(NULL, width, q);	396	MF_OBSTACK_GROW(NULL, width, q);