Add a description of UAT fields, and have it as a tooltip in the New/Edit Dialog.

svn path=/trunk/; revision=20797

1 files changed, 20 insertions, 19 deletions

diff --git a/epan/uat.h b/epan/uat.h
index 4390fbe41b..3f6c1361b8 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -194,11 +194,12 @@ typedef struct _uat_field_t {
 	
 	void* fld_data;
 	
+	char* desc;
 	struct _fld_data_t* priv;
 } uat_field_t;
 
 #define FLDFILL NULL
-#define UAT_END_FIELDS {0,PT_TXTMOD_NONE,{0,0,0},{0,0,0},0,FLDFILL}
+#define UAT_END_FIELDS {0,PT_TXTMOD_NONE,{0,0,0},{0,0,0},0,0,FLDFILL}
 
 
 #define UAT_CAT_GENERAL "General"
@@ -302,14 +303,14 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 		} else { \
 			*out_ptr = ""; *out_len = 0; } }
 
-#define UAT_FLD_CSTRING(basename,field_name) \
-	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_str,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_CSTRING(basename,field_name,desc) \
+	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_str,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
-#define UAT_FLD_CSTRING_ISPRINT(basename,field_name) \
-	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_str_isprint,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_CSTRING_ISPRINT(basename,field_name,desc) \
+	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_str_isprint,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
-#define UAT_FLD_CSTRING_OTHER(basename,field_name,chk) \
-	{#field_name, PT_TXTMOD_STRING,{ chk ,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_CSTRING_OTHER(basename,field_name,chk,desc) \
+	{#field_name, PT_TXTMOD_STRING,{ chk ,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
 /*
  * LSTRING MACROS
@@ -325,8 +326,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 	} else { \
 		*out_ptr = ""; *out_len = 0; } }
 
-#define UAT_FLD_LSTRING(basename,field_name) \
-{#field_name, PT_TXTMOD_STRING,{NULL,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_LSTRING(basename,field_name,desc) \
+{#field_name, PT_TXTMOD_STRING,{0,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
 
 /*
@@ -344,8 +345,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 	*out_ptr = ((rec_t*)rec)->ptr_element ? ep_memdup(((rec_t*)rec)->ptr_element,((rec_t*)rec)->len_element) : ""; \
 	*out_len = ((rec_t*)rec)->len_element; }
 
-#define UAT_FLD_BUFFER(basename,field_name) \
-	{#field_name, PT_TXTMOD_HEXBYTES,{NULL,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_BUFFER(basename,field_name,desc) \
+	{#field_name, PT_TXTMOD_HEXBYTES,{0,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
 
 /*
@@ -359,8 +360,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 	*out_ptr = ep_strdup_printf("%d",((rec_t*)rec)->field_name); \
 	*out_len = strlen(*out_ptr); }
 
-#define UAT_FLD_DEC(basename,field_name) \
-	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_dec,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_DEC(basename,field_name,desc) \
+	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_dec,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
 
 /*
@@ -374,8 +375,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 	*out_ptr = ep_strdup_printf("%x",((rec_t*)rec)->field_name); \
 	*out_len = strlen(*out_ptr); }
 
-#define UAT_FLD_HEX(basename,field_name) \
-{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_hex,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_HEX(basename,field_name,desc) \
+{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_hex,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
 
 
 /*
@@ -402,8 +403,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 			*out_len = strlen(*out_ptr); return; } } }
 
 
-#define UAT_FLD_VS(basename,field_name,enum) \
-	{#field_name, PT_TXTMOD_ENUM,{uat_fld_chk_enum,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{&(enum),&(enum),&(enum)},&(enum),FLDFILL}
+#define UAT_FLD_VS(basename,field_name,enum,desc) \
+	{#field_name, PT_TXTMOD_ENUM,{uat_fld_chk_enum,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{&(enum),&(enum),&(enum)},&(enum),desc,FLDFILL}
 
 
 /*
@@ -424,8 +425,8 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 		*out_ptr = ""; *out_len = 0; } } 
 
 
-#define UAT_FLD_PROTO(basename,field_name) \
-	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_proto,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+#define UAT_FLD_PROTO(basename,field_name,desc) \
+	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_proto,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,FLDFILL}