From beroset:

remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48333

3 files changed, 59 insertions, 57 deletions

diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index d4cb6e8078..fa89fb5057 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -1797,7 +1797,7 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_
       return NULL;
     if (decr->iv_list == NULL) {
       /* First packet */
-      ivd = g_malloc(sizeof(iv_data_t));
+      ivd = (iv_data_t *)g_malloc(sizeof(iv_data_t));
       ivd->frame_num = pinfo->fd->num;
       ivd->iv_len = digest_size;
       decr->last_message_id = hdr->message_id;
@@ -1810,7 +1810,7 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_
       iv_len = ivd->iv_len;
       memcpy(iv, ivd->iv, iv_len);
     } else if (decr->last_cbc_len >= cbc_block_size) {
-      ivd = g_malloc(sizeof(iv_data_t));
+      ivd = (iv_data_t *)g_malloc(sizeof(iv_data_t));
       ivd->frame_num = pinfo->fd->num;
       if (hdr->message_id != decr->last_message_id) {
 	if (decr->last_p1_cbc_len == 0) {
@@ -1846,7 +1846,7 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_
   if (gcry_cipher_setkey(decr_ctx, decr->secret, decr->secret_len))
     return NULL;
 
-  decrypted_data = g_malloc(buf_len);
+  decrypted_data = (guint8 *)g_malloc(buf_len);
 
   if (gcry_cipher_decrypt(decr_ctx, decrypted_data, buf_len, buf, buf_len) != GPG_ERR_NO_ERROR) {
     g_free(decrypted_data);
@@ -2734,8 +2734,8 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     decr = (decrypt_data_t*) g_hash_table_lookup(isakmp_hash, i_cookie);
 
     if (! decr) {
-      ic_key = g_slice_alloc(COOKIE_SIZE);
-      decr   = g_slice_alloc(sizeof(decrypt_data_t));
+      ic_key = (guint8 *)g_slice_alloc(COOKIE_SIZE);
+      decr   = (decrypt_data_t *)g_slice_alloc(sizeof(decrypt_data_t));
       memcpy(ic_key, i_cookie, COOKIE_SIZE);
       memset(decr, 0, sizeof(decrypt_data_t));
       SET_ADDRESS(&decr->initiator, AT_NONE, 0, NULL);
@@ -2765,11 +2765,11 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     hash_key.spii_len = COOKIE_SIZE;
     hash_key.spir_len = COOKIE_SIZE;
 
-    ike_sa_data = g_hash_table_lookup(ikev2_key_hash, &hash_key);
+    ike_sa_data = (ikev2_uat_data_t *)g_hash_table_lookup(ikev2_key_hash, &hash_key);
     if (ike_sa_data) {
       guint8 initiator_flag;
       initiator_flag = hdr.flags & I_FLAG;
-      ikev2_dec_data = ep_alloc(sizeof(ikev2_decrypt_data_t));
+      ikev2_dec_data = ep_new(ikev2_decrypt_data_t);
       ikev2_dec_data->encr_key = initiator_flag ? ike_sa_data->sk_ei : ike_sa_data->sk_er;
       ikev2_dec_data->auth_key = initiator_flag ? ike_sa_data->sk_ai : ike_sa_data->sk_ar;
       ikev2_dec_data->encr_spec = ike_sa_data->encr_spec;
@@ -3586,11 +3586,11 @@ _U_
 
 #ifdef HAVE_LIBGCRYPT
   if (decr && decr->gi_len == 0 && ADDRESSES_EQUAL(&decr->initiator, &pinfo->src)) {
-    decr->gi = g_malloc(length);
+    decr->gi = (gchar *)g_malloc(length);
     tvb_memcpy(tvb, decr->gi, offset, length);
     decr->gi_len = length;
   } else if (decr && decr->gr_len == 0 && !ADDRESSES_EQUAL(&decr->initiator, &pinfo->src)) {
-    decr->gr = g_malloc(length);
+    decr->gr = (gchar *)g_malloc(length);
     tvb_memcpy(tvb, decr->gr, offset, length);
     decr->gr_len = length;
   }
@@ -4615,7 +4615,7 @@ dissect_enc(tvbuff_t *tvb,
     if (iv_len) {
       iv_item = proto_tree_add_item(tree, hf_isakmp_enc_iv, tvb, offset, iv_len, ENC_NA);
       proto_item_append_text(iv_item, " (%d bytes)", iv_len);
-      iv = ep_tvb_memdup(tvb, offset, iv_len);
+      iv = (guchar *)ep_tvb_memdup(tvb, offset, iv_len);
 
       offset += iv_len;
     }
@@ -4625,7 +4625,7 @@ dissect_enc(tvbuff_t *tvb,
      */
     encr_data_item = proto_tree_add_item(tree, hf_isakmp_enc_data, tvb, offset, encr_data_len, ENC_NA);
     proto_item_append_text(encr_data_item, " (%d bytes)",encr_data_len);
-    encr_data = ep_tvb_memdup(tvb, offset, encr_data_len);
+    encr_data = (guchar *)ep_tvb_memdup(tvb, offset, encr_data_len);
     offset += encr_data_len;
 
     /*
@@ -4652,7 +4652,7 @@ dissect_enc(tvbuff_t *tvb,
         }
 
         /* Calculate hash over the bytes from the beginning of the ISAKMP header to the right before the ICD. */
-        entire_message = ep_tvb_memdup(tvb, 0, offset);
+        entire_message = (guchar *)ep_tvb_memdup(tvb, 0, offset);
         gcry_md_write(md_hd, entire_message, offset);
         md = gcry_md_read(md_hd, 0);
         md_len = gcry_md_get_algo_dlen(key_info->auth_spec->gcry_alg);
@@ -4839,7 +4839,8 @@ static guint ikev2_key_hash_func(gconstpointer k) {
 }
 
 static gint ikev2_key_equal_func(gconstpointer k1, gconstpointer k2) {
-  const ikev2_uat_data_key_t *key1 = k1, *key2 = k2;
+  const ikev2_uat_data_key_t *key1 = (const ikev2_uat_data_key_t *)k1; 
+  const ikev2_uat_data_key_t *key2 = (const ikev2_uat_data_key_t *)k2;
   if (key1->spii_len != key2->spii_len) return 0;
   if (key1->spir_len != key2->spir_len) return 0;
   if (memcmp(key1->spii, key2->spii, key1->spii_len) != 0) return 0;
@@ -4853,8 +4854,8 @@ static gint ikev2_key_equal_func(gconstpointer k1, gconstpointer k2) {
 static gboolean
 free_cookie(gpointer key_arg, gpointer value, gpointer user_data _U_)
 {
-  guint8 *ic_key = key_arg;
-  decrypt_data_t *decr = value;
+  guint8 *ic_key = (guint8 *)key_arg;
+  decrypt_data_t *decr = (decrypt_data_t *)value;
 
   g_slice_free1(COOKIE_SIZE, ic_key);
   g_slice_free1(sizeof(decrypt_data_t), decr);
@@ -4880,8 +4881,8 @@ isakmp_init_protocol(void) {
   isakmp_hash = g_hash_table_new(isakmp_hash_func, isakmp_equal_func);
 
   for (i = 0; i < num_ikev1_uat_data; i++) {
-      ic_key = g_slice_alloc(COOKIE_SIZE);
-      decr   = g_slice_alloc(sizeof(decrypt_data_t));
+      ic_key = (guint8 *)g_slice_alloc(COOKIE_SIZE);
+      decr   = (decrypt_data_t *)g_slice_alloc(sizeof(decrypt_data_t));
       memcpy(ic_key, ikev1_uat_data[i].icookie, COOKIE_SIZE);
       memset(decr, 0, sizeof(decrypt_data_t));
 
@@ -4915,7 +4916,7 @@ UAT_BUFFER_CB_DEF(ikev1_users, icookie, ikev1_uat_data_key_t, icookie, icookie_l
 UAT_BUFFER_CB_DEF(ikev1_users, key, ikev1_uat_data_key_t, key, key_len)
 
 static void ikev1_uat_data_update_cb(void* p, const char** err) {
-  ikev1_uat_data_key_t *ud = p;
+  ikev1_uat_data_key_t *ud = (ikev1_uat_data_key_t *)p;
 
   if (ud->icookie_len != COOKIE_SIZE) {
     *err = ep_strdup_printf("Length of Initiator's COOKIE must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2);
@@ -4944,7 +4945,7 @@ UAT_BUFFER_CB_DEF(ikev2_users, sk_ar, ikev2_uat_data_t, sk_ar, sk_ar_len)
 UAT_VS_DEF(ikev2_users, auth_alg, ikev2_uat_data_t, guint, IKEV2_AUTH_HMAC_SHA1_96, IKEV2_AUTH_HMAC_SHA1_96_STR)
 
 static void ikev2_uat_data_update_cb(void* p, const char** err) {
-  ikev2_uat_data_t *ud = p;
+  ikev2_uat_data_t *ud = (ikev2_uat_data_t *)p;
 
   if (ud->key.spii_len != COOKIE_SIZE) {
     *err = ep_strdup_printf("Length of Initiator's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2);
@@ -6119,7 +6120,7 @@ proto_register_isakmp(void)
       sizeof(ikev1_uat_data_key_t),
       "ikev1_decryption_table",
       TRUE,
-      (void*)&ikev1_uat_data,
+      (void**)&ikev1_uat_data,
       &num_ikev1_uat_data,
       UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
       "ChIKEv1DecryptionSection",
@@ -6139,7 +6140,7 @@ proto_register_isakmp(void)
       sizeof(ikev2_uat_data_t),
       "ikev2_decryption_table",
       TRUE,
-      (void*)&ikev2_uat_data,
+      (void**)&ikev2_uat_data,
       &num_ikev2_uat_data,
       UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
       "ChIKEv2DecryptionSection",
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index 8953a24c36..f271b74006 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -316,7 +316,7 @@ get_nbns_name(tvbuff_t *tvb, int offset, int nbns_data_offset,
     char         *pname_ret;
     size_t        idx = 0;
 
-    nbname_buf = ep_alloc(NBNAME_BUF_LEN);
+    nbname_buf = (char *)ep_alloc(NBNAME_BUF_LEN);
     nbname = nbname_buf;
     /* XXX Fix data len */
     name_len = get_dns_name(tvb, offset, 0, nbns_data_offset, &name);
@@ -404,7 +404,7 @@ get_nbns_name_type_class(tvbuff_t *tvb, int offset, int nbns_data_offset,
 {
     int name_len;
     int type;
-    int class;
+    int rr_class;
 
     name_len = get_nbns_name(tvb, offset, nbns_data_offset, name_ret,
                              *name_len_ret, name_type_ret);
@@ -413,10 +413,10 @@ get_nbns_name_type_class(tvbuff_t *tvb, int offset, int nbns_data_offset,
     type = tvb_get_ntohs(tvb, offset);
     offset += 2;
 
-    class = tvb_get_ntohs(tvb, offset);
+    rr_class = tvb_get_ntohs(tvb, offset);
 
     *type_ret = type;
-    *class_ret = class;
+    *class_ret = rr_class;
     *name_len_ret = name_len;
 
     return name_len + 4;
@@ -446,19 +446,19 @@ dissect_nbns_query(tvbuff_t *tvb, int offset, int nbns_data_offset,
     int         name_len;
     int         name_type;
     int         type;
-    int         class;
+    int         dns_class;
     const char *type_name;
     int         data_offset;
     int         data_start;
     proto_tree *q_tree;
     proto_item *tq;
 
-    name = ep_alloc(MAX_NAME_LEN);
+    name = (char *)ep_alloc(MAX_NAME_LEN);
     data_start = data_offset = offset;
 
     name_len = MAX_NAME_LEN;
     len = get_nbns_name_type_class(tvb, offset, nbns_data_offset, name,
-                                   &name_len, &name_type, &type, &class);
+                                   &name_len, &name_type, &type, &dns_class);
     data_offset += len;
 
     type_name = nbns_type_name(type);
@@ -469,7 +469,7 @@ dissect_nbns_query(tvbuff_t *tvb, int offset, int nbns_data_offset,
     if (nbns_tree != NULL) {
         tq = proto_tree_add_text(nbns_tree, tvb, offset, len,
                                  "%s: type %s, class %s",  name, type_name,
-                                 dns_class_name(class));
+                                 dns_class_name(dns_class));
         q_tree = proto_item_add_subtree(tq, ett_nbns_qd);
 
         add_name_and_type(q_tree, tvb, offset, name_len, "Name", name,
@@ -480,7 +480,7 @@ dissect_nbns_query(tvbuff_t *tvb, int offset, int nbns_data_offset,
         offset += 2;
 
         proto_tree_add_text(q_tree, tvb, offset, 2, "Class: %s",
-                            dns_class_name(class));
+                            dns_class_name(dns_class));
         /*offset += 2;*/
     }
 
@@ -510,7 +510,7 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in
     if (!nbns_tree)
         return;
 
-    buf = ep_alloc(MAX_BUF_SIZE);
+    buf = (char *)ep_alloc(MAX_BUF_SIZE);
     opcode = (guint16) ((flags & F_OPCODE) >> OPCODE_SHIFT);
     g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str_const(opcode, opcode_vals, "Unknown operation"));
     if (flags & F_RESPONSE && !is_wack) {
@@ -610,7 +610,7 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset,
     int         name_len;
     int         name_type;
     int         type;
-    int         class;
+    int         dns_class;
     const char *class_name;
     const char *type_name;
     int         cur_offset;
@@ -625,17 +625,17 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset,
 
     cur_offset = offset;
 
-    name     = ep_alloc(MAX_NAME_LEN);
-    name_str = ep_alloc(MAX_NAME_LEN);
-    nbname   = ep_alloc(16+4+1); /* 4 for [<last char>] */
+    name     = (char *)ep_alloc(MAX_NAME_LEN);
+    name_str = (char *)ep_alloc(MAX_NAME_LEN);
+    nbname   = (char *)ep_alloc(16+4+1); /* 4 for [<last char>] */
 
     name_len = MAX_NAME_LEN;
     len      = get_nbns_name_type_class(tvb, offset, nbns_data_offset, name,
-                                        &name_len, &name_type, &type, &class);
+                                        &name_len, &name_type, &type, &dns_class);
     cur_offset  += len;
 
     type_name  = nbns_type_name(type);
-    class_name = dns_class_name(class);
+    class_name = dns_class_name(dns_class);
 
     ttl = tvb_get_ntohl(tvb, cur_offset);
     cur_offset  += 4;
@@ -663,7 +663,7 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset,
             g_strlcat(name, netbios_name_type_descr(name_type), MAX_NAME_LEN);
             g_strlcat(name, ")", MAX_NAME_LEN);
             rr_tree = add_rr_to_tree(trr, ett_nbns_rr, tvb, offset, name,
-                                 name_len, type_name, dns_class_name(class), ttl, data_len);
+                                 name_len, type_name, dns_class_name(dns_class), ttl, data_len);
         }
         while (data_len > 0) {
             if (opcode == OPCODE_WACK) {
@@ -714,7 +714,7 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset,
                                       "%s: type %s, class %s",
                                       name, type_name, class_name);
             rr_tree = add_rr_to_tree(trr, ett_nbns_rr, tvb, offset, name,
-                                     name_len, type_name, dns_class_name(class), ttl, data_len);
+                                     name_len, type_name, dns_class_name(dns_class), ttl, data_len);
         }
 
         if (data_len < 1) {
@@ -1001,7 +1001,7 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset,
                                       "%s: type %s, class %s",
                                       name, type_name, class_name);
             rr_tree = add_rr_to_tree(trr, ett_nbns_rr, tvb, offset, name,
-                                     name_len, type_name, dns_class_name(class), ttl, data_len);
+                                     name_len, type_name, dns_class_name(dns_class), ttl, data_len);
             proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data");
         }
         cur_offset += data_len;
@@ -1234,7 +1234,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     int name_type;
     int len;
 
-    name = ep_alloc(MAX_NAME_LEN);
+    name = (char *)ep_alloc(MAX_NAME_LEN);
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBDS");
     col_clear(pinfo->cinfo, COL_INFO);
@@ -1441,7 +1441,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo,
     const char   *saved_proto;
     void	 *pd_save;
 
-    name = ep_alloc(MAX_NAME_LEN);
+    name = (char *)ep_alloc(MAX_NAME_LEN);
 
     /* Desegmentation */
     length_remaining = tvb_length_remaining(tvb, offset);
@@ -1641,7 +1641,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static void
 dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    struct tcpinfo *tcpinfo = pinfo->private_data;
+    struct tcpinfo *tcpinfo = (struct tcpinfo *)pinfo->private_data;
     int             offset  = 0;
     int             max_data;
     guint8	    msg_type;
diff --git a/ui/recent.c b/ui/recent.c
index 80860a60cf..6772565b42 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -118,7 +118,7 @@ free_col_width_info(recent_settings_t *rs)
   col_width_data *cfmt;
 
   while (rs->col_width_list != NULL) {
-    cfmt = rs->col_width_list->data;
+    cfmt = (col_width_data *)rs->col_width_list->data;
     g_free(cfmt->cfield);
     g_free(cfmt);
     rs->col_width_list = g_list_remove_link(rs->col_width_list, rs->col_width_list);
@@ -131,12 +131,13 @@ free_col_width_info(recent_settings_t *rs)
  *
  * @param key unused
  * @param value the geometry values
- * @param rf recent file handle (FILE)
+ * @param rfh recent file handle (FILE)
  */
 static void
-write_recent_geom(gpointer key _U_, gpointer value, gpointer rf)
+write_recent_geom(gpointer key _U_, gpointer value, gpointer rfh)
 {
-    window_geometry_t *geom = value;
+    window_geometry_t *geom = (window_geometry_t *)value;
+    FILE *rf = (FILE *)rfh;
 
     fprintf(rf, "\n# Geometry and maximized state of %s window.\n", geom->key);
     fprintf(rf, "# Decimal integers.\n");
@@ -169,7 +170,7 @@ window_geom_save(const gchar *name, window_geometry_t *geom)
         window_geom_hash = g_hash_table_new(g_str_hash, g_str_equal);
     }
     /* if we have an old one, remove and free it first */
-    work = g_hash_table_lookup(window_geom_hash, name);
+    work = (window_geometry_t *)g_hash_table_lookup(window_geom_hash, name);
     if(work) {
         g_hash_table_remove(window_geom_hash, name);
         g_free(work->key);
@@ -177,7 +178,7 @@ window_geom_save(const gchar *name, window_geometry_t *geom)
     }
 
     /* g_malloc and insert the new one */
-    work = g_malloc(sizeof(*geom));
+    work = (window_geometry_t *)g_malloc(sizeof(window_geometry_t));
     *work = *geom;
     key = g_strdup(name);
     work->key = key;
@@ -196,7 +197,7 @@ window_geom_load(const gchar       *name,
         window_geom_hash = g_hash_table_new(g_str_hash, g_str_equal);
     }
 
-    p = g_hash_table_lookup(window_geom_hash, name);
+    p = (window_geometry_t *)g_hash_table_lookup(window_geom_hash, name);
     if(p) {
         *geom = *p;
         return TRUE;
@@ -731,13 +732,13 @@ read_set_recent_pair_static(gchar *key, const gchar *value,
     }
   } else if (strcmp(key, RECENT_GUI_TIME_FORMAT) == 0) {
     recent.gui_time_format =
-	find_index_from_string_array(value, ts_type_text, TS_RELATIVE);
+	(ts_type)find_index_from_string_array(value, ts_type_text, TS_RELATIVE);
   } else if (strcmp(key, RECENT_GUI_TIME_PRECISION) == 0) {
     recent.gui_time_precision =
 	find_index_from_string_array(value, ts_precision_text, TS_PREC_AUTO);
   } else if (strcmp(key, RECENT_GUI_SECONDS_FORMAT) == 0) {
     recent.gui_seconds_format =
-	find_index_from_string_array(value, ts_seconds_text, TS_SECONDS_DEFAULT);
+	(ts_seconds_type)find_index_from_string_array(value, ts_seconds_text, TS_SECONDS_DEFAULT);
   } else if (strcmp(key, RECENT_GUI_ZOOM_LEVEL) == 0) {
     num = strtol(value, &p, 0);
     if (p == value || *p != '\0')
@@ -786,15 +787,15 @@ read_set_recent_pair_static(gchar *key, const gchar *value,
     col_l_elt = g_list_first(col_l);
     while(col_l_elt) {
       /* Make sure the format isn't empty.  */
-      if (strcmp(col_l_elt->data, "") == 0) {
+      if (strcmp((const char *)col_l_elt->data, "") == 0) {
       	/* It is.  */
         prefs_clear_string_list(col_l);
         return PREFS_SET_SYNTAX_ERR;
       }
 
       /* Check the format.  */
-      if (strncmp(col_l_elt->data, cust_format, cust_format_len) != 0) {
-        if (get_column_format_from_str(col_l_elt->data) == -1) {
+      if (strncmp((const char *)col_l_elt->data, cust_format, cust_format_len) != 0) {
+        if (get_column_format_from_str((const gchar *)col_l_elt->data) == -1) {
           /* It's not a valid column format.  */
           prefs_clear_string_list(col_l);
           return PREFS_SET_SYNTAX_ERR;
@@ -811,7 +812,7 @@ read_set_recent_pair_static(gchar *key, const gchar *value,
     recent.col_width_list = NULL;
     col_l_elt = g_list_first(col_l);
     while(col_l_elt) {
-      gchar *fmt = g_strdup(col_l_elt->data);
+      gchar *fmt = g_strdup((const gchar *)col_l_elt->data);
       cfmt = (col_width_data *) g_malloc(sizeof(col_width_data));
       if (strncmp(fmt, cust_format, cust_format_len) != 0) {
 	cfmt->cfmt   = get_column_format_from_str(fmt);
@@ -828,7 +829,7 @@ read_set_recent_pair_static(gchar *key, const gchar *value,
       }
 
       col_l_elt      = col_l_elt->next;
-      cfmt->width    = (gint)strtol(col_l_elt->data, &p, 0);
+      cfmt->width    = (gint)strtol((const char *)col_l_elt->data, &p, 0);
       if (p == col_l_elt->data || (*p != '\0' && *p != ':')) {
 	g_free(cfmt->cfield);
 	g_free(cfmt);