Changeset bfc0072 in buchla-68k

Timestamp:

07/08/2017 01:00:47 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

dfe4288

Parents:

72d4545

Message:

varargs.h -> stdarg.h.

Files:

• include/stdarg.h (added)
• include/varargs.h (deleted)
• iolib/dofmt.c (modified) (1 diff)
• iolib/printf.c (modified) (2 diffs)
• iolib/sprintf.c (modified) (2 diffs)
• libcio/fprintf.c (modified) (3 diffs)

iolib/dofmt.c

@@ -24 +24 @@
 #include "stddefs.h"
 #include "ctype.h"
-#include "varargs.h"
+#include "stdarg.h"
 
 #define MAXDIGS 11

iolib/printf.c

@@ -15 +15 @@
 #include "stddefs.h"
 #include "biosdefs.h"
-#include "varargs.h"
+#include "stdarg.h"
 
 extern  long    dofmt_();
@@ -27 +27 @@
 */
 
-long
-printf(fmt, va_alist)
-char *fmt;
-va_dcl
+long printf(char *fmt, ...)
 {
         register long count;
         va_list aptr;
 
-        va_start(aptr);
+        va_start(aptr, fmt);
         count = dofmt_(fpsub, fmt, aptr);
         va_end(aptr);

iolib/sprintf.c

@@ -6 +6 @@
 */
 
-#include "varargs.h"
+#include "stdarg.h"
 
 extern long     dofmt_();
@@ -19 +19 @@
 */
 
-long
-sprintf(str, fmt, va_alist)
-char *str, *fmt;
-va_dcl
+long sprintf(char *str, char *fmt, ...)
 {
         register long count;
         va_list aptr;
 
-        va_start(aptr);
         buff = str;
+        va_start(aptr, fmt);
         count = dofmt_(spsub, fmt, aptr);
+        va_end(aptr);
         *buff = '\0';
         return(count);

libcio/fprintf.c

@@ -8 +8 @@
 #include "stdio.h"
 #include "stddefs.h"
-#include "varargs.h"
+#include "stdarg.h"
 
 static FILE *Stream;
@@ -17 +17 @@
 static  int     fpsub();
 
-int
-fprintf(stream, fmt, va_alist)
-FILE *stream;
-char *fmt;
-va_dcl
+int fprintf(FILE *stream, char *fmt, ...)
 {
         register int count;
@@ -27 +23 @@
 
         Stream = stream;
-        va_start(aptr);
+        va_start(aptr, fmt);
         count = _dofmt(fpsub, fmt, aptr);
         va_end(aptr);