[Xfce4-commits] <terminal:master> Use static array for regex tags.

[Nick Schermer]

Updating branch refs/heads/master
         to e9f29edf2419e34cbe2fd02d20f89e0fead5c185 (commit)
       from 17f1c5a88fecbe3a20277e579fb3e96963399963 (commit)

commit e9f29edf2419e34cbe2fd02d20f89e0fead5c185
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Dec 24 12:29:12 2012 +0100

    Use static array for regex tags.

 terminal/terminal-widget.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index dca60ba..1aada96 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -119,7 +119,7 @@ struct _TerminalWidget
 
   /*< private >*/
   TerminalPreferences *preferences;
-  gint                *regex_tags;
+  gint                 regex_tags[G_N_ELEMENTS (regex_patterns)];
 };
 
 
@@ -178,16 +178,12 @@ terminal_widget_class_init (TerminalWidgetClass *klass)
 static void
 terminal_widget_init (TerminalWidget *widget)
 {
-  guint i;
-
-  /* initialize regex tag ids */
-  widget->regex_tags = g_new (gint, G_N_ELEMENTS (regex_patterns));
-  for (i = 0; i < G_N_ELEMENTS (regex_patterns); i++)
-    widget->regex_tags[i] = -1;
-
   /* query preferences connection */
   widget->preferences = terminal_preferences_get ();
 
+  /* unset tags */
+  memset (widget->regex_tags, -1, sizeof (widget->regex_tags));
+
   /* setup Drag'n'Drop support */
   gtk_drag_dest_set (GTK_WIDGET (widget),
                      GTK_DEST_DEFAULT_MOTION |
@@ -211,9 +207,6 @@ terminal_widget_finalize (GObject *object)
 {
   TerminalWidget *widget = TERMINAL_WIDGET (object);
 
-  /* free tag ids */
-  g_free (widget->regex_tags);
-
   /* disconnect the misc-highlight-urls watch */
   g_signal_handlers_disconnect_by_func (G_OBJECT (widget->preferences), G_CALLBACK (terminal_widget_update_highlight_urls), widget);