Merge branch 'development' into dtls

* development:
  Fix left out printf's
This commit is contained in:
Manuel Pégourié-Gonnard 2015-01-29 11:53:35 +00:00
commit b8a923db2b
3 changed files with 5 additions and 6 deletions

View file

@ -87,7 +87,7 @@ int main( int argc, char *argv[] )
ret = 0;
cleanup:
printf( "\n" );
polarssl_printf( "\n" );
fclose( f );
entropy_free( &entropy );

View file

@ -1720,7 +1720,7 @@ reset:
#if !defined(_WIN32)
if( received_sigterm )
{
printf( " interrupted by SIGTERM\n" );
polarssl_printf( " interrupted by SIGTERM\n" );
ret = 0;
goto exit;
}
@ -2108,7 +2108,6 @@ data_exchange:
}
buf[written] = '\0';
printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
polarssl_printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
ret = 0;
@ -2146,7 +2145,7 @@ exit:
}
#endif
printf( " . Cleaning up..." );
polarssl_printf( " . Cleaning up..." );
fflush( stdout );
if( client_fd != -1 )
@ -2190,7 +2189,7 @@ exit:
memory_buffer_alloc_free();
#endif
printf( " done.\n" );
polarssl_printf( " done.\n" );
#if defined(_WIN32)
polarssl_printf( " + Press Enter to exit this program.\n" );

View file

@ -94,7 +94,7 @@ while (my $line = <GREP>)
my $found_hl = grep $_ eq $module_name, @high_level_modules;
if (!$found_ll && !$found_hl)
{
printf("Error: Do not know how to handle: $module_name\n");
polarssl_printf("Error: Do not know how to handle: $module_name\n");
exit 1;
}