[commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc

[Thomas Fitzsimmons]

CVSROOT:        /sources/classpath
Module name:    classpath
Changes by:     Thomas Fitzsimmons <fitzsim>    06/06/09 14:53:34

Modified files:
        .              : ChangeLog 
        native/plugin  : gcjwebplugin.cc 

Log message:
        2006-06-09  Thomas Fitzsimmons  <[EMAIL PROTECTED]>
        
                * native/plugin/gcjwebplugin.cc (PLUGIN_ERROR_THREE): New macro.
                (NP_Initialize): Use PLUGIN_ERROR_THREE in place of g_strconcat.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7736&r2=1.7737
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7736
retrieving revision 1.7737
diff -u -b -r1.7736 -r1.7737
--- ChangeLog   9 Jun 2006 14:08:38 -0000       1.7736
+++ ChangeLog   9 Jun 2006 14:53:33 -0000       1.7737
@@ -1,3 +1,8 @@
+2006-06-09  Thomas Fitzsimmons  <[EMAIL PROTECTED]>
+
+       * 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  <[EMAIL PROTECTED]>
 
        * javax/swing/plaf/basic/BasicComboBoxRenderer.java:

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /sources/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- native/plugin/gcjwebplugin.cc       8 Jun 2006 21:49:11 -0000       1.10
+++ native/plugin/gcjwebplugin.cc       9 Jun 2006 14:53:34 -0000       1.11
@@ -79,6 +79,10 @@
   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,8 +1625,8 @@
       file_error = g_mkdir (data_directory, 0700);
       if (file_error != 0)
         {
-          PLUGIN_ERROR_TWO (g_strconcat("Failed to create data directory ", 
-                            data_directory, NULL),
+          PLUGIN_ERROR_THREE ("Failed to create data directory",
+                              data_directory,
                             strerror (errno));
           return NPERR_GENERIC_ERROR;
         }
@@ -1635,15 +1639,15 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO (g_strconcat("Failed to open whitelist file ",
-                            whitelist_filename, NULL),
+          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;
     }