FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the buglet about failing to report the program's name on error-

Browse Source 
messages.  Please test.  (Modified glutInit(), the state structure,
and the warn/err functions.)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@238 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-10-26 04:39:27 +00:00
parent fb3db77b9a
commit 04c6d13777
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freeglut/freeglut/src/freeglut_init.c
View File

@ -379,6 +379,10 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
char* displayName = NULL; char* displayName = NULL;
int i, j, argc = *pargc; int i, j, argc = *pargc;
if (pargc && *pargc && argv && *argv && **argv)
fgState.ProgramName = strdup (*argv);
else
fgState.ProgramName = strdup ("");
/* /*
* Do not allow multiple initialization of the library * Do not allow multiple initialization of the library
*/ */

2
freeglut/freeglut/src/freeglut_internal.h
View File

@ -245,8 +245,8 @@ struct tagSFG_State
int GameModeRefresh; /* The refresh rate for game mode */ int GameModeRefresh; /* The refresh rate for game mode */
int ActionOnWindowClose; /* Action when user clicks "x" on window header bar */ int ActionOnWindowClose; /* Action when user clicks "x" on window header bar */
fgExecutionState ExecState; /* Current state of the GLUT execution */ fgExecutionState ExecState; /* Current state of the GLUT execution */
char *ProgramName;
}; };
/* /*

4
freeglut/freeglut/src/freeglut_main.c
View File

@ -396,7 +396,7 @@ void fgError( const char *fmt, ... )
va_start( ap, fmt ); va_start( ap, fmt );
fprintf( stderr, "freeglut: "); fprintf( stderr, "freeglut (%s): ", fgState.ProgramName || "");
vfprintf( stderr, fmt, ap ); vfprintf( stderr, fmt, ap );
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
@ -411,7 +411,7 @@ void fgWarning( const char *fmt, ... )
va_start( ap, fmt ); va_start( ap, fmt );
fprintf( stderr, "freeglut: "); fprintf( stderr, "freeglut (%s): ", fgState.ProgramName || "");
vfprintf( stderr, fmt, ap ); vfprintf( stderr, fmt, ap );
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );