* debugify.c, debugify.h: Make safe for non-ansi compilers.

This commit is contained in:
Dawn Perchik 1997-02-13 00:01:21 +00:00
parent 2dec49333b
commit 8662603f08
3 changed files with 42 additions and 8 deletions

View File

@ -1,4 +1,8 @@
Wed Feb 12 15:58:00 1997 Dawn Perchik <dawn@cygnus.com>
* debugify.c, debugify.h: Make safe for non-ansi compilers.
Wed Feb 12 15:30:00 1997 Dawn Perchik <dawn@cygnus.com> Wed Feb 12 15:30:00 1997 Dawn Perchik <dawn@cygnus.com>
* defs.h: Fix prototypes for new cleanup functions. * defs.h: Fix prototypes for new cleanup functions.

View File

@ -28,12 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#else #else
#include <strings.h> #include <strings.h>
#endif #endif
#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#define DEBUGIFY #define DEBUGIFY
#include "debugify.h" #include "debugify.h"
@ -45,7 +39,8 @@ static char fname[128];
static int file_cnt = 0; /* count number of open files */ static int file_cnt = 0; /* count number of open files */
void void
puts_dbg (const char *data) puts_dbg (data)
const char *data;
{ {
FILE *fdbg; FILE *fdbg;
@ -58,7 +53,9 @@ puts_dbg (const char *data)
/* Can't easily get the message back to gdb... write to a log instead. */ /* Can't easily get the message back to gdb... write to a log instead. */
void void
fputs_dbg (const char *data, FILE * fakestream) fputs_dbg (data, fakestream)
const char *data;
FILE *fakestream;
{ {
#ifdef REDIRECT #ifdef REDIRECT
puts_dbg (data); puts_dbg (data);
@ -88,11 +85,23 @@ fputs_dbg (const char *data, FILE * fakestream)
} }
void void
#ifdef ANSI_PROTOTYPES
printf_dbg (const char *format,...) printf_dbg (const char *format,...)
#else
printf_dbg (va_alist)
va_dcl
#endif
{ {
va_list args; va_list args;
char buf[256]; char buf[256];
#ifdef ANSI_PROTOTYPES
va_start (args, format); va_start (args, format);
#else
char *format;
va_start (args);
format = va_arg (args, char *);
#endif
vsprintf (buf, format, args); vsprintf (buf, format, args);
puts_dbg (buf); puts_dbg (buf);
va_end (args); va_end (args);

View File

@ -22,14 +22,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#ifndef _DEBUGIFY_H_ #ifndef _DEBUGIFY_H_
#define _DEBUGIFY_H_ #define _DEBUGIFY_H_
#include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#ifdef DEBUGIFY #ifdef DEBUGIFY
#include <assert.h> #include <assert.h>
#ifdef TO_SCREEN #ifdef TO_SCREEN
#ifdef _Win32
#define DBG(x) OutputDebugString x #define DBG(x) OutputDebugString x
#else
#define DBG(x) printf x
#endif
#elif TO_GDB #elif TO_GDB
#define DBG(x) printf_unfiltered x #define DBG(x) printf_unfiltered x
#elif TO_POPUP #elif TO_POPUP
#ifdef _Win32
#define DBG(x) MessageBox x #define DBG(x) MessageBox x
#else
#define DBG(x) printf x
#endif
#else /* default: TO_FILE "gdb.log" */ #else /* default: TO_FILE "gdb.log" */
#define DBG(x) printf_dbg x #define DBG(x) printf_dbg x
#endif #endif
@ -53,7 +69,12 @@ extern "C"
#endif /* REDIRECT */ #endif /* REDIRECT */
extern void puts_dbg PARAMS ((const char *fmt)); extern void puts_dbg PARAMS ((const char *fmt));
#ifdef ANSI_PROTOTYPES
extern void printf_dbg PARAMS ((const char *fmt,...)); extern void printf_dbg PARAMS ((const char *fmt,...));
#else
extern void printf_dbg PARAMS ((va_alist va_dcl));
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }