Do not use overlapping memory in g_snprintf.

Use consistent spacing between title and value.

svn path=/trunk/; revision=51181

1 files changed, 13 insertions, 12 deletions

diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index b67a41f915..4b706eb394 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -684,6 +684,7 @@ summary_to_texbuff(GtkTextBuffer *buffer)
 {
   summary_tally summary;
   gchar         string_buff[SUM_STR_MAX];
+  gchar         tmp_buff[SUM_STR_MAX];
   gchar *buf_str;
   unsigned int  i;
   unsigned int  elapsed_time;
@@ -705,16 +706,16 @@ summary_to_texbuff(GtkTextBuffer *buffer)
   gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
   /* Filename */
-  g_snprintf(string_buff, SUM_STR_MAX, INDENT "Name:             %s\n", summary.filename);
+  g_snprintf(string_buff, SUM_STR_MAX, INDENT "Name: %s\n", summary.filename);
   gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
   /* length */
-  g_snprintf(string_buff, SUM_STR_MAX, INDENT "Length:            %" G_GINT64_MODIFIER "d bytes\n",
+  g_snprintf(string_buff, SUM_STR_MAX, INDENT "Length: %" G_GINT64_MODIFIER "d bytes\n",
              summary.file_length);
   gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
   /* format */
-  g_snprintf(string_buff, SUM_STR_MAX, INDENT "Format:            %s%s",
+  g_snprintf(string_buff, SUM_STR_MAX, INDENT "Format: %s%s",
              wtap_file_type_string(summary.file_type),
              summary.iscompressed? " (gzip compressed)\n" : "\n");
   gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
@@ -722,12 +723,12 @@ summary_to_texbuff(GtkTextBuffer *buffer)
   /* encapsulation */
   if (summary.file_encap_type == WTAP_ENCAP_PER_PACKET) {
     for (i = 0; i < summary.packet_encap_types->len; i++) {
-      g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation:    %s\n",
+      g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation: %s\n",
                  wtap_encap_string(g_array_index(summary.packet_encap_types, int, i)));
       gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
     }
   } else {
-    g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation:    %s\n", wtap_encap_string(summary.file_encap_type));
+    g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation: %s\n", wtap_encap_string(summary.file_encap_type));
     gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
   }
   if (summary.has_snap) {
@@ -748,13 +749,13 @@ summary_to_texbuff(GtkTextBuffer *buffer)
     gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
     /* start time */
-    time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.start_time);
-    g_snprintf(string_buff, SUM_STR_MAX, INDENT "First packet: %s\n",string_buff);
+    time_to_string(tmp_buff, SUM_STR_MAX, (time_t)summary.start_time);
+    g_snprintf(string_buff, SUM_STR_MAX, INDENT "First packet: %s\n",tmp_buff);
     gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
     /* stop time */
-    time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.stop_time);
-    g_snprintf(string_buff, SUM_STR_MAX, INDENT "Last packet: %s\n", string_buff);
+    time_to_string(tmp_buff, SUM_STR_MAX, (time_t)summary.stop_time);
+    g_snprintf(string_buff, SUM_STR_MAX, INDENT "Last packet: %s\n", tmp_buff);
     gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
     /*
@@ -765,13 +766,13 @@ summary_to_texbuff(GtkTextBuffer *buffer)
       /* elapsed seconds */
       elapsed_time = (unsigned int)summary.elapsed_time;
       if(elapsed_time/86400) {
-          g_snprintf(string_buff, SUM_STR_MAX, "%02u days %02u:%02u:%02u",
+          g_snprintf(tmp_buff, SUM_STR_MAX, "%02u days %02u:%02u:%02u",
             elapsed_time/86400, elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
       } else {
-          g_snprintf(string_buff, SUM_STR_MAX, "%02u:%02u:%02u",
+          g_snprintf(tmp_buff, SUM_STR_MAX, "%02u:%02u:%02u",
             elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
       }
-      g_snprintf(string_buff, SUM_STR_MAX, INDENT "Elapsed: %s\n", string_buff);
+      g_snprintf(string_buff, SUM_STR_MAX, INDENT "Elapsed: %s\n", tmp_buff);
       gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
     }
   }