diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-10-01 22:09:38 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-10-01 22:09:38 +0000 |
| commit | c2e5e4868d1a313f241bfe4925303313a1fc0498 (patch) | |
| tree | 6e36cb393811d508311245b20554a864ddc3b81e | |
| parent | d525c0129eec28d18d6d78a5732b0afc2b08c879 (diff) | |
| download | wireshark-c2e5e4868d1a313f241bfe4925303313a1fc0498.tar.gz | |
Don't define "transport_prot_name[]" in "h323_conversations.h", as that
puts a separate copy in every file that includes "h323_conversations.h",
even if it doesn't use that copy. Instead, define it in
"h323_conversations.c" and declare it in "h323_conversations.h".
svn path=/trunk/; revision=12179
| -rw-r--r-- | gtk/h323_conversations.c | 29 | ||||
| -rw-r--r-- | gtk/h323_conversations.h | 29 |
2 files changed, 30 insertions, 28 deletions
diff --git a/gtk/h323_conversations.c b/gtk/h323_conversations.c index 263bae9b1a..70e39014b0 100644 --- a/gtk/h323_conversations.c +++ b/gtk/h323_conversations.c @@ -55,6 +55,35 @@ #include <string.h> +char *transport_prot_name[256] ={ + "","","","","","","tcp","","","", /* 0 to 10 */ + "","","","","","","","udp","","", /* 10 to 20 */ + "","","","","","","","","","", /* 20 to 30 */ + "","","","","","","","","","", /* 30 to 40 */ + "","","","","","","","","","", /* 40 to 50 */ + "","","","","","","","","","", /* 50 to 60 */ + "","","","","","","","","","", /* 60 to 70 */ + "","","","","","","","","","", /* 70 to 80 */ + "","","","","","","","","","", /* 80 to 90 */ + "","","","","","","","","","", /* 90 to 100 */ + "","","","","","","","","","", /* 100 to 110 */ + "","","","","","","","","","", /* 110 to 120 */ + "","","","","","","","","","", /* 120 to 130 */ + "","","sctp","","","","","","","", /* 130 to 140 */ + "","","","","","","","","","", /* 140 to 150 */ + "","","","","","","","","","", /* 150 to 160 */ + "","","","","","","","","","", /* 160 to 170 */ + "","","","","","","","","","", /* 170 to 180 */ + "","","","","","","","","","", /* 180 to 190 */ + "","","","","","","","","","", /* 190 to 200 */ + "","","","","","","","","","", /* 200 to 210 */ + "","","","","","","","","","", /* 210 to 220 */ + "","","","","","","","","","", /* 220 to 230 */ + "","","","","","","","","","", /* 230 to 240 */ + "","","","","","","","","","", /* 240 to 250 */ + "","","","","","" /* 250 to 255 */ + }; + /****************************************************************************/ /* the one and only global h323conversations_tapinfo_t structure */ static h323conversations_tapinfo_t the_tapinfo_struct = diff --git a/gtk/h323_conversations.h b/gtk/h323_conversations.h index 1a02e36a61..d20c19c6a6 100644 --- a/gtk/h323_conversations.h +++ b/gtk/h323_conversations.h @@ -66,34 +66,7 @@ typedef struct _h323_conversations_info { } h323_conversations_info_t; -static char *transport_prot_name[256] ={ - "","","","","","","tcp","","","", /* 0 to 10 */ - "","","","","","","","udp","","", /* 10 to 20 */ - "","","","","","","","","","", /* 20 to 30 */ - "","","","","","","","","","", /* 30 to 40 */ - "","","","","","","","","","", /* 40 to 50 */ - "","","","","","","","","","", /* 50 to 60 */ - "","","","","","","","","","", /* 60 to 70 */ - "","","","","","","","","","", /* 70 to 80 */ - "","","","","","","","","","", /* 80 to 90 */ - "","","","","","","","","","", /* 90 to 100 */ - "","","","","","","","","","", /* 100 to 110 */ - "","","","","","","","","","", /* 110 to 120 */ - "","","","","","","","","","", /* 120 to 130 */ - "","","sctp","","","","","","","", /* 130 to 140 */ - "","","","","","","","","","", /* 140 to 150 */ - "","","","","","","","","","", /* 150 to 160 */ - "","","","","","","","","","", /* 160 to 170 */ - "","","","","","","","","","", /* 170 to 180 */ - "","","","","","","","","","", /* 180 to 190 */ - "","","","","","","","","","", /* 190 to 200 */ - "","","","","","","","","","", /* 200 to 210 */ - "","","","","","","","","","", /* 210 to 220 */ - "","","","","","","","","","", /* 220 to 230 */ - "","","","","","","","","","", /* 230 to 240 */ - "","","","","","","","","","", /* 240 to 250 */ - "","","","","","" /* 250 to 255 */ - }; +extern char *transport_prot_name[256]; /* structure that holds the information about all detected conversationss */ /* struct holding all information of the tap */ |