|
 |
481f9a5 |
diff -up plib-1.8.5/src/ssg/ssgParser.cxx~ plib-1.8.5/src/ssg/ssgParser.cxx
|
|
|
481f9a5 |
--- plib-1.8.5/src/ssg/ssgParser.cxx~ 2008-03-11 03:06:23.000000000 +0100
|
|
|
481f9a5 |
+++ plib-1.8.5/src/ssg/ssgParser.cxx 2012-11-01 15:33:12.424483374 +0100
|
|
|
481f9a5 |
@@ -57,18 +57,16 @@ void _ssgParser::error( const char *form
|
|
|
481f9a5 |
char msgbuff[ 255 ];
|
|
|
481f9a5 |
va_list argp;
|
|
|
481f9a5 |
|
|
|
481f9a5 |
- char* msgptr = msgbuff;
|
|
|
481f9a5 |
- if (linenum)
|
|
|
481f9a5 |
- {
|
|
|
481f9a5 |
- msgptr += sprintf ( msgptr,"%s, line %d: ",
|
|
|
481f9a5 |
- path, linenum );
|
|
|
481f9a5 |
- }
|
|
|
481f9a5 |
-
|
|
|
481f9a5 |
va_start( argp, format );
|
|
|
481f9a5 |
- vsprintf( msgptr, format, argp );
|
|
|
481f9a5 |
+ vsnprintf( msgbuff, sizeof(msgbuff), format, argp );
|
|
|
481f9a5 |
va_end( argp );
|
|
|
481f9a5 |
|
|
|
481f9a5 |
- ulSetError ( UL_WARNING, "%s", msgbuff ) ;
|
|
|
481f9a5 |
+ if (linenum)
|
|
|
481f9a5 |
+ {
|
|
|
481f9a5 |
+ ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ;
|
|
|
481f9a5 |
+ } else {
|
|
|
481f9a5 |
+ ulSetError ( UL_WARNING, "%s", msgbuff ) ;
|
|
|
481f9a5 |
+ }
|
|
|
481f9a5 |
}
|
|
|
481f9a5 |
|
|
|
481f9a5 |
|
|
|
481f9a5 |
@@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo
|
|
|
481f9a5 |
char msgbuff[ 255 ];
|
|
|
481f9a5 |
va_list argp;
|
|
|
481f9a5 |
|
|
|
481f9a5 |
- char* msgptr = msgbuff;
|
|
|
481f9a5 |
- if (linenum)
|
|
|
481f9a5 |
- {
|
|
|
481f9a5 |
- msgptr += sprintf ( msgptr,"%s, line %d: ",
|
|
|
481f9a5 |
- path, linenum );
|
|
|
481f9a5 |
- }
|
|
|
481f9a5 |
-
|
|
|
481f9a5 |
va_start( argp, format );
|
|
|
481f9a5 |
- vsprintf( msgptr, format, argp );
|
|
|
481f9a5 |
+ vsnprintf( msgbuff, sizeof(msgbuff), format, argp );
|
|
|
481f9a5 |
va_end( argp );
|
|
|
481f9a5 |
|
|
|
481f9a5 |
- ulSetError ( UL_DEBUG, "%s", msgbuff ) ;
|
|
|
481f9a5 |
+ if (linenum)
|
|
|
481f9a5 |
+ {
|
|
|
481f9a5 |
+ ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ;
|
|
|
481f9a5 |
+ } else {
|
|
|
481f9a5 |
+ ulSetError ( UL_DEBUG, "%s", msgbuff ) ;
|
|
|
481f9a5 |
+ }
|
|
|
481f9a5 |
}
|
|
|
481f9a5 |
|
|
|
481f9a5 |
// Opens the file and does a few internal calculations based on the spec.
|