[Commit]
jove ask.c,1.4,1.5 disp.c,1.3,1.4 error.c,1.2,1.3 extend.c,1.2,1.3
fmt.c,1.2,1.3 iproc-pipes.c,1.1.1.1,1.2 iproc-ptys.c,1.4,1.5
jove.c,1.5,1.6 jove.h,1.6,1.7 move.c,1.2,1.3 nproc.c,1.1.1.1,1.2
proc.c,1.2,1.3 term.c,1.4,1.5 util.c,1.3,1.4
Keith Packard
commit at keithp.com
Tue Jun 10 11:32:09 PDT 2003
Committed by: keithp
Update of /local/src/CVS/jove
In directory home.keithp.com:/tmp/cvs-serv32120
Modified Files:
ask.c disp.c error.c extend.c fmt.c iproc-pipes.c iproc-ptys.c
jove.c jove.h move.c nproc.c proc.c term.c util.c
Log Message:
Switch from varargs.h to stdarg.h
Index: ask.c
===================================================================
RCS file: /local/src/CVS/jove/ask.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ask.c 15 May 2003 06:00:14 -0000 1.4
+++ ask.c 10 Jun 2003 17:32:07 -0000 1.5
@@ -8,7 +8,7 @@
#include "jove.h"
#include "ctype.h"
#include <signal.h>
-#include <varargs.h>
+#include <stdarg.h>
#ifdef F_COMPLETION
# include <sys/stat.h>
@@ -230,16 +230,13 @@
/* VARARGS2 */
char *
-ask(def, fmt, va_alist)
-char *def,
- *fmt;
-va_dcl
+ask(char *def, char *fmt, ...)
{
char prompt[V_STRING_LEN];
char *ans;
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(prompt, sizeof prompt, fmt, ap);
va_end(ap);
ans = real_ask("\r\n", (int (*)()) 0, def, prompt);
@@ -254,33 +251,25 @@
/* VARARGS1 */
char *
-do_ask(delim, d_proc, def, fmt, va_alist)
-char *delim,
- *def,
- *fmt;
-int (*d_proc)();
-va_dcl
+do_ask(char *delim, int (*d_proc)(), char *def, char *fmt, ...)
{
char prompt[V_STRING_LEN];
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(prompt, sizeof prompt, fmt, ap);
va_end(ap);
return real_ask(delim, d_proc, def, prompt);
}
-/* VARARGS1 */
-
-yes_or_no_p(fmt, va_alist)
-char *fmt;
-va_dcl
+int
+yes_or_no_p(char *fmt, ...)
{
char prompt[V_STRING_LEN];
int c;
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(prompt, sizeof prompt, fmt, ap);
va_end(ap);
for (;;) {
Index: disp.c
===================================================================
RCS file: /local/src/CVS/jove/disp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- disp.c 15 May 2003 00:01:06 -0000 1.3
+++ disp.c 10 Jun 2003 17:32:07 -0000 1.4
@@ -10,7 +10,7 @@
#include "termcap.h"
#include "io.h"
-#include <varargs.h>
+#include <stdarg.h>
#include <signal.h>
#include <sys/stat.h>
@@ -1302,9 +1302,8 @@
/* VARARGS1 */
-Typeout(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+Typeout(char *fmt, ...)
{
if (TOabort)
return;
@@ -1329,7 +1328,7 @@
char string[132];
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(string, sizeof string, fmt, ap);
va_end(ap);
if (UseBuffers)
Index: error.c
===================================================================
RCS file: /local/src/CVS/jove/error.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- error.c 15 May 2003 00:01:06 -0000 1.2
+++ error.c 10 Jun 2003 17:32:07 -0000 1.3
@@ -8,7 +8,7 @@
#include "jove.h"
#include "io.h"
-#include <varargs.h>
+#include <stdarg.h>
char ErrorPattern[V_STRING_LEN] =
"^\\{\",\\}\\([^:\"( \t]*\\)\\{\"\\, line ,:,(\\} *\\([0-9][0-9]*\\)[:)]";
Index: extend.c
===================================================================
RCS file: /local/src/CVS/jove/extend.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extend.c 11 Jul 2001 06:42:26 -0000 1.2
+++ extend.c 10 Jun 2003 17:32:07 -0000 1.3
@@ -12,8 +12,6 @@
# include <signal.h>
#endif
-#include <varargs.h>
-
int InJoverc;
extern int terminch(),
@@ -311,7 +309,6 @@
static char *mapn[] = { "", "ESC ", "C-X ", "Prefix-3 ", 0 };
static char *type = "Type \"%s%p\" to invoke %s.";
data_obj **map;
- char *sprint();
data_obj *this;
if (!flag) {
@@ -337,8 +334,6 @@
DescBindings()
{
- extern int Typeout();
-
TOstart("Key Bindings", TRUE);
DescMap(mainmap, NullStr);
TOstop();
Index: fmt.c
===================================================================
RCS file: /local/src/CVS/jove/fmt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fmt.c 11 Jul 2001 06:42:26 -0000 1.2
+++ fmt.c 10 Jun 2003 17:32:07 -0000 1.3
@@ -8,8 +8,6 @@
#include "jove.h"
#include "io.h"
-#include <varargs.h>
-
private
outld(long d, int base);
@@ -30,10 +28,8 @@
# define strput(c, s) (--(s)->s_cnt >= 0 ? *(s)->s_ptr++ = (c) : 0)
-format(buf, len, fmt, ap)
-char *buf,
- *fmt;
-va_list ap;
+void
+format(char *buf, int len, char *fmt, va_list ap)
{
String s;
@@ -262,79 +258,62 @@
current_fmt = prev_fmt;
}
-/* VARARGS1 */
-
char *
-sprint(fmt, va_alist)
-char *fmt;
-va_dcl
+sprint(char *fmt, ...)
{
va_list ap;
static char line[LBSIZE];
- va_start(ap);
+ va_start(ap, fmt);
format(line, sizeof line, fmt, ap);
va_end(ap);
return line;
}
-/* VARARGS2 */
-
-jove_sprintf(str, fmt, va_alist)
-char *str,
- *fmt;
-va_dcl
+void
+jove_sprintf (char *str, char *fmt, ...)
{
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(str, 130, fmt, ap);
va_end(ap);
}
-/* VARARGS1 */
-
-s_mess(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+s_mess(char *fmt, ...)
{
va_list ap;
if (InJoverc)
return;
- va_start(ap);
+ va_start(ap, fmt);
format(mesgbuf, sizeof mesgbuf, fmt, ap);
va_end(ap);
message(mesgbuf);
}
-/* VARARGS1 */
-
-f_mess(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+f_mess(char *fmt, ...)
{
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(mesgbuf, sizeof mesgbuf, fmt, ap);
va_end(ap);
DrawMesg(NO);
UpdMesg++; /* Still needs updating (for convenience) */
}
-/* VARARGS1 */
-
-add_mess(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+add_mess(char *fmt, ...)
{
int mesg_len = strlen(mesgbuf);
va_list ap;
if (InJoverc)
return;
- va_start(ap);
+ va_start(ap, fmt);
format(&mesgbuf[mesg_len], (sizeof mesgbuf) - mesg_len, fmt, ap);
va_end(ap);
message(mesgbuf);
Index: iproc-pipes.c
===================================================================
RCS file: /local/src/CVS/jove/iproc-pipes.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- iproc-pipes.c 10 Mar 2001 12:23:12 -0000 1.1.1.1
+++ iproc-pipes.c 10 Jun 2003 17:32:07 -0000 1.2
@@ -216,9 +216,7 @@
/* VARARGS3 */
private
-proc_strt(bufname, type, disp, size, clobber, va_alist)
-char *bufname;
-va_dcl
+proc_strt(char *bufname, int type, int disp, int size, int clobber, ...)
{
Window *owind = curwind;
int toproc[2],
@@ -246,7 +244,7 @@
argv[0] = "portsrv";
argv[1] = foo;
sprintf(foo, "%d", ProcInput);
- va_start(ap);
+ va_start(ap, clobber);
make_argv(&argv[2], ap);
va_end(ap);
(void) dup2(toproc[0], 0);
Index: iproc-ptys.c
===================================================================
RCS file: /local/src/CVS/jove/iproc-ptys.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iproc-ptys.c 24 Aug 2001 09:02:38 -0000 1.4
+++ iproc-ptys.c 10 Jun 2003 17:32:07 -0000 1.5
@@ -345,9 +345,7 @@
/* VARARGS5 */
Process *
-proc_strt(bufname, type, disp, wsize, clobber, va_alist)
-char *bufname;
-va_dcl
+proc_strt(char *bufname, int type, int disp, int wsize, int clobber, ...)
{
va_list ap;
char *argv[32],
@@ -566,7 +564,7 @@
sprintf (buf, "failed: %d failed_errno: %d\n", failed, failed_errno);
write (2, buf, strlen (buf));
}
- va_start(ap);
+ va_start(ap, clobber);
make_argv(argv, ap);
va_end(ap);
execve(argv[0], &argv[1], iproc_environ);
@@ -618,7 +616,7 @@
#endif
cmdbuf[0] = '\0';
- va_start(ap);
+ va_start(ap, clobber);
while (cp = va_arg(ap, char *)) {
/*
* if it's the shell, pare down the directories
Index: jove.c
===================================================================
RCS file: /local/src/CVS/jove/jove.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jove.c 15 May 2003 06:00:14 -0000 1.5
+++ jove.c 10 Jun 2003 17:32:07 -0000 1.6
@@ -12,7 +12,6 @@
#include "io.h"
#include "termcap.h"
-#include <varargs.h>
#include <sys/stat.h>
#include <signal.h>
#include <errno.h>
@@ -934,16 +933,13 @@
}
}
-/* VARARGS1 */
-
-error(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+error(char *fmt, ...)
{
va_list ap;
if (fmt) {
- va_start(ap);
+ va_start(ap, fmt);
format(mesgbuf, sizeof mesgbuf, fmt, ap);
va_end(ap);
UpdMesg++;
@@ -954,14 +950,13 @@
/* VARARGS1 */
-complain(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+complain(char *fmt, ...)
{
va_list ap;
if (fmt) {
- va_start(ap);
+ va_start(ap, fmt);
format(mesgbuf, sizeof mesgbuf, fmt, ap);
va_end(ap);
UpdMesg++;
@@ -972,14 +967,13 @@
/* VARARGS1 */
-confirm(fmt, va_alist)
-char *fmt;
-va_dcl
+void
+confirm(char *fmt, ...)
{
char *yorn;
va_list ap;
- va_start(ap);
+ va_start(ap, fmt);
format(mesgbuf, sizeof mesgbuf, fmt, ap);
va_end(ap);
yorn = ask((char *) 0, mesgbuf);
Index: jove.h
===================================================================
RCS file: /local/src/CVS/jove/jove.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jove.h 15 May 2003 06:00:14 -0000 1.6
+++ jove.h 10 Jun 2003 17:32:07 -0000 1.7
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <unistd.h>
#ifndef TUNED
# include "tune.h"
@@ -649,8 +650,8 @@
*basename(),
*filename(),
*IOerr(),
- *ask(),
- *do_ask(),
+ *ask(char *def, char *fmt, ...),
+ *do_ask(char *delim, int (*d_proc)(), char *def, char *fmt, ...),
*ask_buf(),
*ask_file(),
*lcontents(),
@@ -663,8 +664,9 @@
*rindex(),
*getenv(),
*tgoto(),
+ *toneparm (char *cap, ...),
*pr_name(),
- *sprint(),
+ *sprint(char *fmt, ...),
#ifdef IPROCS
*pstate(),
#endif
@@ -679,6 +681,20 @@
*lisp_indent(),
#endif
*m_paren();
+
+extern int
+ yes_or_no_p(char *fmt, ...);
+
+extern void
+ Typeout(char *fmt, ...),
+ jove_sprintf (char *str, char *fmt, ...),
+ s_mess(char *fmt, ...),
+ f_mess(char *fmt, ...),
+ complain(char *fmt, ...),
+ confirm(char *fmt, ...),
+ error(char *fmt, ...),
+ add_mess(char *fmt, ...);
+
extern Mark
*CurMark(),
Index: move.c
===================================================================
RCS file: /local/src/CVS/jove/move.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- move.c 15 May 2003 00:01:06 -0000 1.2
+++ move.c 10 Jun 2003 17:32:07 -0000 1.3
@@ -144,7 +144,6 @@
SetTrack ()
{
char *tosend;
- extern char *toneparm();
if (InputPending || !TR)
return;
tosend = toneparm (TR, track_on, track_x0, track_y0, track_ymin, track_ymax);
Index: nproc.c
===================================================================
RCS file: /local/src/CVS/jove/nproc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- nproc.c 10 Mar 2001 12:23:12 -0000 1.1.1.1
+++ nproc.c 10 Jun 2003 17:32:07 -0000 1.2
@@ -130,11 +130,8 @@
to fix everything up after we're done. (Usually there's nothing to
fix up.) */
-/* VARARGS5 */
-
-UnixToBuf(bufname, disp, wsize, clobber, va_alist)
-char *bufname;
-va_dcl
+int
+UnixToBuf(char *bufname, int disp, int wsize, int clobber, ...)
{
int p[2],
pid,
@@ -145,7 +142,7 @@
FILE *fp;
int (*old_int)();
- va_start(ap);
+ va_start(ap, clobber);
make_argv(argv, ap);
va_end(ap);
if (clobber)
Index: proc.c
===================================================================
RCS file: /local/src/CVS/jove/proc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- proc.c 15 May 2003 00:01:06 -0000 1.2
+++ proc.c 10 Jun 2003 17:32:07 -0000 1.3
@@ -13,7 +13,6 @@
#include "io.h"
#include <signal.h>
-#include <varargs.h>
int WtOnMk = 1; /* Write the modified files when we make */
char ShcomBuf[128];
Index: term.c
===================================================================
RCS file: /local/src/CVS/jove/term.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- term.c 15 May 2003 00:01:07 -0000 1.4
+++ term.c 10 Jun 2003 17:32:07 -0000 1.5
@@ -275,29 +275,21 @@
#define MAXRETURNSIZE 64
-#include <varargs.h>
-
void
-toneparm_varargs ();
+toneparm_varargs (char *result, char *cap, va_list args);
void
-toneparm_recurse (result, cap, va_alist)
-char *result;
-char *cap;
-va_dcl
+toneparm_recurse (char *result, char *cap, ...)
{
va_list args;
- va_start (args);
+ va_start (args, cap);
toneparm_varargs (result, cap, args);
va_end (args);
}
void
-toneparm_varargs (result, cap, args)
-char *result;
-char *cap;
-va_list args;
+toneparm_varargs (char *result, char *cap, va_list args)
{
char *cp = cap;
register char *dp = result;
@@ -427,14 +419,12 @@
}
char *
-toneparm (cap, va_alist)
-char *cap;
-va_dcl
+toneparm (char *cap, ...)
{
static char result[MAXRETURNSIZE];
va_list args;
- va_start (args);
+ va_start (args, cap);
toneparm_varargs (result, cap, args);
va_end (args);
return result;
Index: util.c
===================================================================
RCS file: /local/src/CVS/jove/util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- util.c 15 May 2003 00:01:07 -0000 1.3
+++ util.c 10 Jun 2003 17:32:07 -0000 1.4
@@ -9,7 +9,6 @@
#include "ctype.h"
#include "io.h"
#include <signal.h>
-#include <varargs.h>
#ifdef SYSVR2 /* release 2, at least */
short ospeed;
More information about the Commit
mailing list