diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-09 14:53:33 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-09 14:53:33 +0000 |
| commit | c9c6011c4cd53c24d1eaf06a502f4104eec3c794 (patch) | |
| tree | 1781cca90840f21b8092224619da1dc9ead2e2d7 | |
| parent | 990780dcd6b722567c128e5c8e0b98a52626ea7e (diff) | |
| download | classpath-c9c6011c4cd53c24d1eaf06a502f4104eec3c794.tar.gz | |
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* native/plugin/gcjwebplugin.cc (PLUGIN_ERROR_THREE): New macro.
(NP_Initialize): Use PLUGIN_ERROR_THREE in place of g_strconcat.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | native/plugin/gcjwebplugin.cc | 22 |
2 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com> + + * native/plugin/gcjwebplugin.cc (PLUGIN_ERROR_THREE): New macro. + (NP_Initialize): Use PLUGIN_ERROR_THREE in place of g_strconcat. + 2006-06-09 Francis Kung <fkung@redhat.com> * javax/swing/plaf/basic/BasicComboBoxRenderer.java: diff --git a/native/plugin/gcjwebplugin.cc b/native/plugin/gcjwebplugin.cc index bc3f22324..ad65c7ef1 100644 --- a/native/plugin/gcjwebplugin.cc +++ b/native/plugin/gcjwebplugin.cc @@ -79,6 +79,10 @@ exception statement from your version. */ g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \ g_thread_self (), first, second) +#define PLUGIN_ERROR_THREE(first, second, third) \ + g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \ + __LINE__, g_thread_self (), first, second, third) + // Plugin information passed to about:plugins. #define PLUGIN_NAME "GCJ Web Browser Plugin" #define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets." @@ -1621,9 +1625,9 @@ NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) file_error = g_mkdir (data_directory, 0700); if (file_error != 0) { - PLUGIN_ERROR_TWO (g_strconcat("Failed to create data directory ", - data_directory, NULL), - strerror (errno)); + PLUGIN_ERROR_THREE ("Failed to create data directory", + data_directory, + strerror (errno)); return NPERR_GENERIC_ERROR; } } @@ -1635,16 +1639,16 @@ NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) { if (channel_error) { - PLUGIN_ERROR_TWO (g_strconcat("Failed to open whitelist file ", - whitelist_filename, NULL), - channel_error->message); + PLUGIN_ERROR_THREE ("Failed to open whitelist file", + whitelist_filename, + channel_error->message); g_error_free (channel_error); channel_error = NULL; } else - PLUGIN_ERROR (g_strconcat("Failed to open whitelist file ", - whitelist_filename, NULL)); - + PLUGIN_ERROR_TWO ("Failed to open whitelist file", + whitelist_filename); + return NPERR_GENERIC_ERROR; } |