Move definitions of value_string tables out of header files and into

source files, so that they're not defined in every file that includes
the header file, regardless of whether the file uses the table (in which
case it should be defined in one file, and externally referenced in
other files) or not (in which case it should't be defined in that file
at all).

Get rid of a boilerplate comment paragraph that doesn't apply.

svn path=/trunk/; revision=7952

1 files changed, 2 insertions, 80 deletions

diff --git a/packet-fclctl.h b/packet-fclctl.h
index 7cd60991ba..d5966b6336 100644
--- a/packet-fclctl.h
+++ b/packet-fclctl.h
@@ -2,7 +2,7 @@
  * Fibre Channel Link Control definitions
  * Copyright 2001 Dinesh G Dutt (ddutt@cisco.com)
  *
- * $Id: packet-fclctl.h,v 1.1 2002/12/08 02:32:17 gerald Exp $
+ * $Id: packet-fclctl.h,v 1.2 2003/06/30 21:50:17 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,60 +37,22 @@
 #define FC_LCTL_NTY       0x08
 #define FC_LCTL_END       0x09
 
-static const value_string fc_lctl_proto_val[] = {
-    {FC_LCTL_ACK1  , "ACK1"},
-    {FC_LCTL_ACK0  , "ACK0"},
-    {FC_LCTL_PRJT  , "P_RJT"},
-    {FC_LCTL_FRJT  , "F_RJT"},
-    {FC_LCTL_PBSY  , "P_BSY"},
-    {FC_LCTL_FBSYL , "F_BSY (Data frame)"},
-    {FC_LCTL_FBSYB , "F_BSY (Link Ctl)"},
-    {FC_LCTL_LCR   , "LCR"},
-    {FC_LCTL_NTY   , "NTY"},
-    {FC_LCTL_END   , "END"},
-    {0, NULL},
-};
+extern const value_string fc_lctl_proto_val[];
 
 #define FC_LCTL_FBSY_FBSY  0x01
 #define FC_LCTL_FBSY_NBSY  0x03
 
-static const value_string fc_lctl_fbsy_val[] = {
-    {FC_LCTL_FBSY_FBSY, "Fabric Busy"},
-    {FC_LCTL_FBSY_NBSY, "N_Port Busy"},
-    {0, NULL}
-};
-
 #define FC_LCTL_PBSY_ACODE_SEQBSY 0x01
 #define FC_LCTL_PBSY_ACODE_C2BSY  0x02
 
-static const value_string fc_lctl_pbsy_acode_val[] = {
-    {FC_LCTL_PBSY_ACODE_SEQBSY, "Sequence Marked Busy"},
-    {FC_LCTL_PBSY_ACODE_C2BSY, "Class 2 Frame Busy"},
-    {0, NULL},
-};
-
 #define FC_LCTL_PBSY_PORTBSY      0x01
 #define FC_LCTL_PBSY_RSRCBSY      0x03
 #define FC_LCTL_PBSY_MCASTBSY     0x07 
 #define FC_LCTL_PBSY_VENDBSY      0xFF
 
-static const value_string fc_lctl_pbsy_rjt_val[] = {
-    {FC_LCTL_PBSY_PORTBSY , "Physical N_Port Busy"},
-    {FC_LCTL_PBSY_RSRCBSY , "N_Port Resource Busy"},
-    {FC_LCTL_PBSY_MCASTBSY, "Partial Multicast Busy"},
-    {FC_LCTL_PBSY_VENDBSY , "Vendor unique Busy"},
-    {0, NULL},
-};
-
 #define FC_LCTL_RJT_ACODE_RETRY   0x01
 #define FC_LCTL_RJT_ACODE_NORETRY 0x02
 
-static const value_string fc_lctl_rjt_acode_val[] = {
-    {FC_LCTL_RJT_ACODE_RETRY, "Retryable Error"},
-    {FC_LCTL_RJT_ACODE_NORETRY, "Non-retryable Error"},
-    {0, NULL},
-};
-
 #define FC_LCTL_RJT_INVDID                 0x01
 #define FC_LCTL_RJT_INVSID                 0x02
 #define FC_LCTL_RJT_NPORT_NOTAVAIL_T       0x03
@@ -128,46 +90,6 @@ static const value_string fc_lctl_rjt_acode_val[] = {
 #define FC_LCTL_RJT_PRLI_REQD              0x24
 #define FC_LCTL_RJT_VEND_ERR               0xFF
 
-static const value_string fc_lctl_rjt_val[] = {
-    {FC_LCTL_RJT_INVSID             , "Invalid S_ID"},
-    {FC_LCTL_RJT_INVDID             , "Invalid D_ID"},
-    {FC_LCTL_RJT_NPORT_NOTAVAIL_T   , "N_Port Not Avail (Temporary)"},
-    {FC_LCTL_RJT_NPORT_NOTAVAIL_P   , "N_Port Not Avail (Permanent)"},
-    {FC_LCTL_RJT_CLASS_NOTSUPP      , "Class Not Supported"},
-    {FC_LCTL_RJT_DELIM_USERR        , "Delimiter Usage Error"},
-    {FC_LCTL_RJT_TYPE_NOTSUPP       , "Type Not Supported"},
-    {FC_LCTL_RJT_INV_LCTL           , "Invalid Link Ctl Frame"},
-    {FC_LCTL_RJT_INV_RCTL           , "Invalid R_CTL"},
-    {FC_LCTL_RJT_INV_FCTL           , "Invalid F_CTL"},
-    {FC_LCTL_RJT_INV_OXID           , "Invalid OX_ID"},
-    {FC_LCTL_RJT_INV_RXID           , "Invalid RX_ID"},
-    {FC_LCTL_RJT_INV_SEQID          , "Invalid SEQID"},
-    {FC_LCTL_RJT_INV_DFCTL          , "Invalid DF_CTL"},
-    {FC_LCTL_RJT_INV_SEQCNT         , "Invalid SEQCNT"},
-    {FC_LCTL_RJT_INV_PARAM          , "Invalid Parameter"},
-    {FC_LCTL_RJT_EXCHG_ERR          , "Exchange Error"},
-    {FC_LCTL_RJT_PROTO_ERR          , "Protocol Error"},
-    {FC_LCTL_RJT_INV_LEN            , "Incorrect Length"},
-    {FC_LCTL_RJT_UNEXP_ACK          , "Unexpected ACK"},
-    {FC_LCTL_RJT_CLS_NOTSUPP        , "Class Not Supported by Entity at 0xFFFFFE"},
-    {FC_LCTL_RJT_LOGI_REQD          , "Login Required"},
-    {FC_LCTL_RJT_TOOMANY_SEQ        , "Excessive Sequences Attempted"},
-    {FC_LCTL_RJT_EXCHG_NOTESTD      , "Exchange Not Established"},
-    {FC_LCTL_RJT_RSVD               , "Reserved"},
-    {FC_LCTL_RJT_FPATH_NOTAVAIL     , "Fabric Path Not Available"},
-    {FC_LCTL_RJT_INV_VCID           , "Invalid VC_ID"},
-    {FC_LCTL_RJT_INV_CSCTL          , "Invalid CS_CTL"},
-    {FC_LCTL_RJT_OORSRC             , "Insufficient Resources of VC (Class 4)"},
-    {FC_LCTL_RJT_INV_CLASS          , "Invalid Class of Service"},
-    {FC_LCTL_RJT_PRMPT_RJT          , "Preemption Request Rejected"},
-    {FC_LCTL_RJT_PRMPT_DIS          , "Preemption Not Enabled"},
-    {FC_LCTL_RJT_MCAST_ERR          , "Multicast Error"},
-    {FC_LCTL_RJT_MCAST_TERM         , "Multicast Error Terminate"},
-    {FC_LCTL_RJT_PRLI_REQD          , "PRLI Required"},
-    {FC_LCTL_RJT_VEND_ERR           , "Vendor Unique Error"},
-    {0, NULL},
-};
-
 /* Function definitions */
 gchar *fclctl_get_typestr (guint8 linkctl_type, guint8 type);
 gchar *fclctl_get_paramstr (guint32 linkctl_type, guint32 param);