# HG changeset patch # User Fridrich Strba # Date 1406043893 14400 # Node ID bfa9387111aa6a53032808a36c550a864553bdba # Parent 6f92839c15df2ffd7ec529095be50b7f977db13d Fix missing return value in non-void function 2014-07-22 Fridrich Strba * plugin/icedteanp/IcedTeaPluginUtils.cc (flush_pre_init_messages): Return NULL explicitly. diff -r 6f92839c15df -r bfa9387111aa ChangeLog --- a/ChangeLog Thu Jul 03 16:40:55 2014 +0200 +++ b/ChangeLog Tue Jul 22 11:44:53 2014 -0400 @@ -1,3 +1,8 @@ +2014-07-22 Fridrich Strba + + * plugin/icedteanp/IcedTeaPluginUtils.cc (flush_pre_init_messages): + Return NULL explicitly. + 2014-07-03 Jiri Vanek * tests/netx/unit/net/sourceforge/jnlp/resources/MessagesPropertiesTest.java diff -r 6f92839c15df -r bfa9387111aa plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Jul 03 16:40:55 2014 +0200 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Jul 22 11:44:53 2014 -0400 @@ -60,25 +60,25 @@ static std::vector< PluginThreadCall* >* pendingPluginThreadRequests = new std::vector< PluginThreadCall* >(); void *flush_pre_init_messages(void* data) { -while (true){ - struct timespec ts; + while (true){ + struct timespec ts; ts.tv_sec = 1; ts.tv_nsec = 0; - nanosleep(&ts ,0); - if (jvm_up) { - while (!pre_jvm_message.empty()) { - pthread_mutex_lock(&debug_pipe_lock); - std::string message = pre_jvm_message.front(); - pre_jvm_message.pop(); - pthread_mutex_unlock(&debug_pipe_lock); - plugin_send_message_to_appletviewer_console(message.c_str()); - + nanosleep(&ts ,0); + if (jvm_up) { + while (!pre_jvm_message.empty()) { + pthread_mutex_lock(&debug_pipe_lock); + std::string message = pre_jvm_message.front(); + pre_jvm_message.pop(); + pthread_mutex_unlock(&debug_pipe_lock); + plugin_send_message_to_appletviewer_console(message.c_str()); + } + flush_plugin_send_message_to_appletviewer_console(); } - flush_plugin_send_message_to_appletviewer_console(); } - + return NULL; } -} + void push_pre_init_messages(char * ldm){ pthread_mutex_lock(&debug_pipe_lock); pre_jvm_message.push(std::string(ldm));