1,4 → 1,4 |
/* $Id: imports.c,v 1.5 2003-03-26 13:51:35 giacomo Exp $ */ |
/* $Id: imports.c,v 1.6 2004-05-26 10:36:50 giacomo Exp $ */ |
|
/* |
* Mesa 3-D graphics library |
369,16 → 369,10 |
_mesa_sprintf( char *str, const char *fmt, ... ) |
{ |
int r; |
va_list args; |
va_start( args, fmt ); |
va_end( args ); |
#if defined(XFree86LOADER) && defined(IN_MODULE) |
r = xf86vsprintf( str, fmt, args ); |
#else |
//r = vsnprintf( str, MAXSTRING, fmt, args ); |
sprintf(str,"%s",fmt); |
r = strlen(fmt); |
#endif |
va_list parms; |
va_start(parms,fmt); |
r = vsprintf(str,fmt,parms); |
va_end(parms); |
return r; |
} |
|
387,11 → 381,13 |
_mesa_printf( const char *fmtString, ... ) |
{ |
char s[MAXSTRING]; |
va_list args; |
va_start( args, fmtString ); |
//vsnprintf(s, MAXSTRING, fmtString, args); |
sprintf(s,"%s",fmtString); |
va_end( args ); |
va_list parms; |
int r; |
|
va_start(parms,fmtString); |
r = vsprintf(s,fmtString,parms); |
va_end(parms); |
|
#if defined(XFree86LOADER) && defined(IN_MODULE) |
xf86printf("%s", s); |
#else |
405,12 → 401,12 |
{ |
GLboolean debug; |
char str[MAXSTRING]; |
va_list args; |
(void) ctx; |
va_start( args, fmtString ); |
//(void) vsnprintf( str, MAXSTRING, fmtString, args ); |
sprintf(str,"%s",fmtString); |
va_end( args ); |
va_list parms; |
int r; |
|
va_start(parms,fmtString); |
r = vsprintf(str,fmtString,parms); |
va_end(parms); |
#ifdef DEBUG |
debug = GL_TRUE; /* always print warning */ |
#else |
477,8 → 473,7 |
const char *errstr; |
|
va_start( args, fmtString ); |
//vsnprintf( where, MAXSTRING, fmtString, args ); |
sprintf(where,"%s",fmtString); |
vsprintf( where, fmtString, args ); |
va_end( args ); |
|
switch (error) { |
526,8 → 521,7 |
char s[MAXSTRING]; |
va_list args; |
va_start(args, fmtString); |
//vsnprintf(s, MAXSTRING, fmtString, args); |
sprintf(s,"%s",fmtString); |
vsprintf(s, fmtString, args); |
va_end(args); |
#if defined(XFree86LOADER) && defined(IN_MODULE) |
xf86fprintf(stderr, "Mesa: %s", s); |
545,7 → 539,6 |
static void * |
default_malloc(__GLcontext *gc, size_t size) |
{ |
(void) gc; |
return _mesa_malloc(size); |
} |
|
552,7 → 545,6 |
static void * |
default_calloc(__GLcontext *gc, size_t numElem, size_t elemSize) |
{ |
(void) gc; |
return _mesa_calloc(numElem * elemSize); |
} |
|
559,7 → 551,6 |
static void * |
default_realloc(__GLcontext *gc, void *oldAddr, size_t newSize) |
{ |
(void) gc; |
#if defined(XFree86LOADER) && defined(IN_MODULE) |
return xf86realloc(oldAddr, newSize); |
#else |
570,7 → 561,6 |
static void |
default_free(__GLcontext *gc, void *addr) |
{ |
(void) gc; |
_mesa_free(addr); |
} |
|
577,7 → 567,6 |
static char * CAPI |
default_getenv( __GLcontext *gc, const char *var ) |
{ |
(void) gc; |
return _mesa_getenv(var); |
} |
|
591,13 → 580,11 |
default_fatal(__GLcontext *gc, char *str) |
{ |
_mesa_problem(gc, str); |
abort(); |
} |
|
static int CAPI |
default_atoi(__GLcontext *gc, const char *str) |
{ |
(void) gc; |
return (int)atoi((char *)str); |
} |
|
607,9 → 594,7 |
int r; |
va_list args; |
va_start( args, fmt ); |
//r = vsnprintf( str, MAXSTRING, fmt, args ); |
sprintf(str,"%s",fmt); |
r = strlen(fmt); |
r = vsprintf( str, fmt, args ); |
va_end( args ); |
return r; |
} |
617,25 → 602,19 |
static void * CAPI |
default_fopen(__GLcontext *gc, const char *path, const char *mode) |
{ |
return NULL;//fopen(path, mode); |
return NULL; |
} |
|
static int CAPI |
default_fclose(__GLcontext *gc, void *stream) |
{ |
return 0;//fclose((FILE *) stream); |
return 0; |
} |
|
static int CAPI |
default_fprintf(__GLcontext *gc, void *stream, const char *fmt, ...) |
{ |
int r; |
va_list args; |
va_start( args, fmt ); |
//r = vsnprintf(tmp, MAXSTRING, fmt, args ); |
r = strlen(fmt); |
va_end( args ); |
return r; |
return 0; |
} |
|
/* XXX this really is driver-specific and can't be here */ |