ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of the vararg and generic stuff.

This commit is contained in:
Vincent Béron 2002-11-18 23:13:05 +00:00 committed by Alexandre Julliard
parent 1eb106b92f
commit 4162abbaf4
2 changed files with 1 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
dlls/richedit/reader.c
View File

@ -44,24 +44,12 @@
* any purpose whatsoever. * any purpose whatsoever.
*/ */
# ifndef STRING_H
# define STRING_H <string.h>
# endif
# include <stdio.h> # include <stdio.h>
# include <ctype.h> # include <ctype.h>
# include STRING_H # include <string.h>
# ifdef STDARG
# include <stdarg.h> # include <stdarg.h>
# else
# ifdef VARARGS
# include <varargs.h>
# endif /* VARARGS */
# endif /* STDARG */
# define rtfInternal
# include "rtf.h" # include "rtf.h"
# undef rtfInternal
/* /*
* include hard coded charsets * include hard coded charsets
@ -2786,12 +2774,6 @@ void RTFSetMsgProc(RTFFuncPtr proc)
} }
# ifdef STDARG
/*
* This version is for systems with stdarg
*/
void RTFMsg (char *fmt, ...) void RTFMsg (char *fmt, ...)
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];
@ -2803,45 +2785,6 @@ char buf[rtfBufSiz];
(*msgProc) (buf); (*msgProc) (buf);
} }
# else /* !STDARG */
# ifdef VARARGS
/*
* This version is for systems that have varargs.
*/
void RTFMsg (va_dcl va_alist)
{
va_list args;
char *fmt;
char buf[rtfBufSiz];
va_start (args);
fmt = va_arg (args, char *);
vsprintf (buf, fmt, args);
va_end (args);
(*msgProc) (buf);
}
# else /* !VARARGS */
/*
* This version is for systems that don't have varargs.
*/
void RTFMsg (char *fmt, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9)
{
char buf[rtfBufSiz];
sprintf (buf, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9);
(*msgProc) (buf);
}
# endif /* !VARARGS */
# endif /* !STDARG */
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
@ -2869,12 +2812,6 @@ void RTFSetPanicProc(RTFFuncPtr proc)
} }
# ifdef STDARG
/*
* This version is for systems with stdarg
*/
void RTFPanic(char *fmt, ...) void RTFPanic(char *fmt, ...)
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];
@ -2892,56 +2829,3 @@ char buf[rtfBufSiz];
} }
(*panicProc) (buf); (*panicProc) (buf);
} }
# else /* !STDARG */
# ifdef VARARGS
/*
* This version is for systems that have varargs.
*/
void RTFPanic(va_dcl va_alist)
{
va_list args;
char *fmt;
char buf[rtfBufSiz];
va_start (args);
fmt = va_arg (args, char *);
vsprintf (buf, fmt, args);
va_end (args);
(void) strcat (buf, "\n");
if (prevChar != EOF && rtfTextBuf != (char *) NULL)
{
sprintf (buf + strlen (buf),
"Last token read was \"%s\" near line %ld, position %d.\n",
rtfTextBuf, rtfLineNum, rtfLinePos);
}
(*panicProc) (buf);
}
# else /* !VARARGS */
/*
* This version is for systems that don't have varargs.
*/
void RTFPanic (char *fmt, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9)
{
char buf[rtfBufSiz];
sprintf (buf, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9);
(void) strcat (buf, "\n");
if (prevChar != EOF && rtfTextBuf != (char *) NULL)
{
sprintf (buf + strlen (buf),
"Last token read was \"%s\" near line %ld, position %d.\n",
rtfTextBuf, rtfLineNum, rtfLinePos);
}
(*panicProc) (buf);
}
# endif /* !VARARGS */
# endif /* !STDARG */

10
dlls/richedit/rtf.h
View File

@ -1438,18 +1438,8 @@ void RTFSetPanicProc ();
* stdarg.h. * stdarg.h.
*/ */
# ifndef rtfInternal
void RTFMsg ();
void RTFPanic ();
# else
# ifdef STDARG
void RTFMsg (char *fmt, ...); void RTFMsg (char *fmt, ...);
void RTFPanic (char *fmt, ...); void RTFPanic (char *fmt, ...);
# else
void RTFMsg ();
void RTFPanic ();
# endif /* STDARG */
# endif /* rtfInternal */
int RTFReadOutputMap (); int RTFReadOutputMap ();
int RTFReadCharSetMap (); int RTFReadCharSetMap ();