Mercurial > hg > release > icedtea-web-1.5
changeset 998:bfa9387111aa
Fix missing return value in non-void function
2014-07-22 Fridrich Strba <fridrich.strba@suse.com>
* plugin/icedteanp/IcedTeaPluginUtils.cc (flush_pre_init_messages):
Return NULL explicitly.
| author | Fridrich Strba <fridrich.strba@suse.com> |
|---|---|
| date | Tue, 22 Jul 2014 11:44:53 -0400 |
| parents | 6f92839c15df |
| children | f16daf7f68fa |
| files | ChangeLog plugin/icedteanp/IcedTeaPluginUtils.cc |
| diffstat | 2 files changed, 19 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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 <fridrich.strba@suse.com> + + * plugin/icedteanp/IcedTeaPluginUtils.cc (flush_pre_init_messages): + Return NULL explicitly. + 2014-07-03 Jiri Vanek <jvanek@redhat.com> * tests/netx/unit/net/sourceforge/jnlp/resources/MessagesPropertiesTest.java
--- 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));