Some custom column fixes:

- In proto_tree_set_uint and proto_tree_set_int use value adjusted for bitmask.
- Removed col_custom_set_fstr in proto_tree_set_boolean to get a correct
  adjusted value in proto_tree_set_uint.
- Set a default column width shorter than COL_INFO. 

svn path=/trunk/; revision=24417

2 files changed, 6 insertions, 3 deletions

diff --git a/epan/column.c b/epan/column.c
index 45cf19e78f..a50bcbd93d 100644
--- a/epan/column.c
+++ b/epan/column.c
@@ -599,6 +599,9 @@ get_column_longest_string(gint format)
     case COL_FREQ_CHAN:
       return "9999 MHz [A 999]";
       break;
+    case COL_CUSTOM:
+      return "0000000000";	/* not the longest, but the longest is too long */
+      break;
     default: /* COL_INFO */
       return "Source port: kerberos-master  Destination port: kerberos-master";
       break;
diff --git a/epan/proto.c b/epan/proto.c
index b0604deda7..133d02fab5 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -2376,7 +2376,6 @@ proto_tree_add_boolean_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint
 static void
 proto_tree_set_boolean(field_info *fi, guint32 value)
 {
-	col_custom_set_fstr(fi->hfinfo->abbrev, "%u", value);
 	proto_tree_set_uint(fi, value);
 }
 
@@ -2649,7 +2648,8 @@ proto_tree_set_uint(field_info *fi, guint32 value)
 			integer >>= hfinfo->bitshift;
 		}
 	}
-	col_custom_set_fstr(hfinfo->abbrev, "%u", value);
+
+	col_custom_set_fstr(hfinfo->abbrev, "%u", integer);
 	fvalue_set_uinteger(&fi->value, integer);
 }
 
@@ -2815,7 +2815,7 @@ proto_tree_set_int(field_info *fi, gint32 value)
 		}
 	}
 
-	col_custom_set_fstr(hfinfo->abbrev, "%d", value);
+	col_custom_set_fstr(hfinfo->abbrev, "%d", integer);
 	fvalue_set_sinteger(&fi->value, integer);
 }