Custom column deprecation:

We fill out the COL_RXID column by using 'pinfo->rxid'. This member is only set by the Fibre Channel dissector based on 'fc.rx_id'. So remove COL_RXID and migrate to 'fc.rx_id' custom column.

svn path=/trunk/; revision=29793

epan/column-utils.c

@@ -1481,11 +1481,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums)
       col_set_port(pinfo, i, FALSE, FALSE);
       break;
 
-    case COL_RXID:
-      g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->rxid);
-      pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i];
-      break;
-
     case COL_SRCIDX:
       g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->src_idx);
       pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i];

epan/column_info.h

@@ -90,7 +90,7 @@ enum {
   COL_EXPERT,         /* 20) Expert Info */
   COL_IF_DIR,         /* 21) FW-1 monitor interface/direction */
   COL_OXID,           /* 22) !! DEPRECATED !! - Fibre Channel OXID */
-  COL_RXID,           /* 23) Fibre Channel RXID */
+  COL_RXID,           /* 23) !! DEPRECATED !! - Fibre Channel RXID */
   COL_FR_DLCI,        /* 24) !! DEPRECATED !! - Frame Relay DLCI */
   COL_FREQ_CHAN,      /* 25) IEEE 802.11 (and WiMax?) - Channel */
   COL_BSSGP_TLLI,     /* 26) !! DEPRECATED !! - GPRS BSSGP IE TLLI */

epan/prefs.c

@@ -1761,7 +1761,8 @@ try_convert_to_custom_column(gpointer *el_data)
         { COL_FR_DLCI, "fr.dlci" },
         { COL_REL_CONV_TIME, "tcp.time_relative" },
         { COL_DELTA_CONV_TIME, "tcp.time_delta" },
-        { COL_OXID, "fc.ox_id" }
+        { COL_OXID, "fc.ox_id" },
+        { COL_RXID, "fc.rx_id" }
     };
 
     guint haystack_idx;

epan/wslua/wslua_pinfo.c

@@ -328,7 +328,6 @@ static const struct col_names_t colnames[] = {
     {"info",COL_INFO},
     {"packet_len",COL_PACKET_LENGTH},
     {"cumulative_bytes",COL_CUMULATIVE_BYTES},
-    {"rxid",COL_RXID},
     {"direction",COL_IF_DIR},
     {"src_idx",COL_SRCIDX},
     {"dst_idx",COL_DSTIDX},