Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 86 → Rev 87

/shark/trunk/ports/mesa/src/imports.c
1,4 → 1,4
/* $Id: imports.c,v 1.3 2003-03-18 15:10:38 giacomo Exp $ */
/* $Id: imports.c,v 1.4 2003-03-18 15:33:01 giacomo Exp $ */
 
/*
* Mesa 3-D graphics library
360,7 → 360,7
#if defined(XFree86LOADER) && defined(IN_MODULE)
return xf86atoi(s);
#else
return atoi(s);
return (int)atoi((char *)s);
#endif
}
 
375,7 → 375,9
#if defined(XFree86LOADER) && defined(IN_MODULE)
r = xf86vsprintf( str, fmt, args );
#else
r = vsnprintf( str, MAXSTRING, fmt, args );
//r = vsnprintf( str, MAXSTRING, fmt, args );
sprintf(str, "");
r = 0;
#endif
return r;
}
387,7 → 389,8
char s[MAXSTRING];
va_list args;
va_start( args, fmtString );
vsnprintf(s, MAXSTRING, fmtString, args);
//vsnprintf(s, MAXSTRING, fmtString, args);
sprintf(s, "");
va_end( args );
#if defined(XFree86LOADER) && defined(IN_MODULE)
xf86printf("%s", s);
405,7 → 408,8
va_list args;
(void) ctx;
va_start( args, fmtString );
(void) vsnprintf( str, MAXSTRING, fmtString, args );
//(void) vsnprintf( str, MAXSTRING, fmtString, args );
sprintf(str, "");
va_end( args );
#ifdef DEBUG
debug = GL_TRUE; /* always print warning */
473,7 → 477,8
const char *errstr;
 
va_start( args, fmtString );
vsnprintf( where, MAXSTRING, fmtString, args );
//vsnprintf( where, MAXSTRING, fmtString, args );
sprintf(where, "");
va_end( args );
 
switch (error) {
521,7 → 526,8
char s[MAXSTRING];
va_list args;
va_start(args, fmtString);
vsnprintf(s, MAXSTRING, fmtString, args);
//vsnprintf(s, MAXSTRING, fmtString, args);
sprintf(s, "");
va_end(args);
#if defined(XFree86LOADER) && defined(IN_MODULE)
xf86fprintf(stderr, "Mesa: %s", s);
592,7 → 598,7
default_atoi(__GLcontext *gc, const char *str)
{
(void) gc;
return atoi(str);
return (int)atoi((char *)str);
}
 
static int CAPI
601,7 → 607,9
int r;
va_list args;
va_start( args, fmt );
r = vsnprintf( str, MAXSTRING, fmt, args );
//r = vsnprintf( str, MAXSTRING, fmt, args );
sprintf(str, "");
r = 0;
va_end( args );
return r;
}
623,11 → 631,10
{
int r;
va_list args;
char tmp[200];
va_start( args, fmt );
r = vsnprintf(tmp, MAXSTRING, fmt, args );
//r = vsnprintf(tmp, MAXSTRING, fmt, args );
r = 0;
va_end( args );
cprintf("%s\n",tmp);
return r;
}