Resolve Coverity issues

Signed-off-by: John Hood <cgull@glup.org>
This commit is contained in:
John Hood
2015-06-10 04:07:35 -04:00
parent 026a3f0346
commit 6f4a59e20f
3 changed files with 70 additions and 54 deletions
+56 -41
View File
@@ -44,6 +44,7 @@
#include <signal.h>
#include <time.h>
#include <limits.h>
#include <exception>
#if HAVE_PTY_H
#include <pty.h>
@@ -64,49 +65,63 @@ using namespace Terminal;
int main( int argc, char **argv )
{
int fbmod = 0;
int width = 80, height = 24;
int iterations = ITERATIONS;
if (argc > 1) iterations = atoi(argv[1]);
if (argc > 3) {
width = atoi(argv[2]);
height = atoi(argv[3]);
}
Framebuffer local_framebuffers[ 2 ] = { Framebuffer(width,height), Framebuffer(width,height) };
Framebuffer *local_framebuffer = &(local_framebuffers[ fbmod ]);
Framebuffer *new_state = &(local_framebuffers[ !fbmod ]);
Overlay::OverlayManager overlays;
Display display( true );
Complete local_terminal( width, height );
/* Adopt native locale */
set_native_locale();
fatal_assert( is_utf8_locale() );
for ( int i = 0; i < iterations; i++ ) {
/* type a character */
overlays.get_prediction_engine().new_user_byte( i + 'x', *local_framebuffer );
/* fetch target state */
*new_state = local_terminal.get_fb();
/* apply local overlays */
overlays.apply( *new_state );
/* calculate minimal difference from where we are */
const string diff( display.new_frame( false,
*local_framebuffer,
*new_state ) );
/* make sure to use diff */
if ( diff.size() > INT_MAX ) {
exit( 1 );
try {
int fbmod = 0;
int width = 80, height = 24;
int iterations = ITERATIONS;
if (argc > 1) {
iterations = atoi(argv[1]);
if (iterations < 1 || iterations > 1000000000) {
fprintf(stderr, "bogus iteration count\n");
exit(1);
}
}
if (argc > 3) {
width = atoi(argv[2]);
height = atoi(argv[3]);
if (width < 1 || width > 1000 || height < 1 || height > 1000) {
fprintf(stderr, "bogus window size\n");
exit(1);
}
}
Framebuffer local_framebuffers[ 2 ] = { Framebuffer(width,height), Framebuffer(width,height) };
Framebuffer *local_framebuffer = &(local_framebuffers[ fbmod ]);
Framebuffer *new_state = &(local_framebuffers[ !fbmod ]);
Overlay::OverlayManager overlays;
Display display( true );
Complete local_terminal( width, height );
fbmod = !fbmod;
local_framebuffer = &(local_framebuffers[ fbmod ]);
new_state = &(local_framebuffers[ !fbmod ]);
/* Adopt native locale */
set_native_locale();
fatal_assert( is_utf8_locale() );
for ( int i = 0; i < iterations; i++ ) {
/* type a character */
overlays.get_prediction_engine().new_user_byte( i + 'x', *local_framebuffer );
/* fetch target state */
*new_state = local_terminal.get_fb();
/* apply local overlays */
overlays.apply( *new_state );
/* calculate minimal difference from where we are */
const string diff( display.new_frame( false,
*local_framebuffer,
*new_state ) );
/* make sure to use diff */
if ( diff.size() > INT_MAX ) {
exit( 1 );
}
fbmod = !fbmod;
local_framebuffer = &(local_framebuffers[ fbmod ]);
new_state = &(local_framebuffers[ !fbmod ]);
}
} catch ( const std::exception &e ) {
fprintf( stderr, "Exception caught: %s\n", e.what() );
return 1;
}
return 0;
}