aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-01-09 13:21:10 -0800
committerGuy Harris <guy@alum.mit.edu>2019-01-09 21:21:56 +0000
commitfd93f5490c6a29d01e5cd11f14679641300469f9 (patch)
tree4f64fc24239fa7c1fe9b337c352624a69f30b0e6 /wiretap/wtap.h
parentc8f87206738f6cfe5328026addc6630b7525c4ad (diff)
Clarify the name and description for a link-layer encapsulation type.
What we were calling the "name" is actually a description to show to users; what were calling the "short name" is just the name to use on the command line. Rename some routines and structure members, and put the name first and description second in the table. Expand some descriptions to give more details (e.g., to be more than just a capitalized version of the name). Fix the CamelCase capitalization of InfiniBand. Change-Id: I060b8bd86573880efd0fab044401b449469563eb Reviewed-on: https://code.wireshark.org/review/31472 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.h')
-rw-r--r--wiretap/wtap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index c4670d5173..0d6bd06972 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -2055,11 +2055,11 @@ WS_DLL_PUBLIC
void wtap_free_extensions_list(GSList *extensions);
WS_DLL_PUBLIC
-const char *wtap_encap_string(int encap);
+const char *wtap_encap_name(int encap);
WS_DLL_PUBLIC
-const char *wtap_encap_short_string(int encap);
+const char *wtap_encap_description(int encap);
WS_DLL_PUBLIC
-int wtap_short_string_to_encap(const char *short_name);
+int wtap_name_to_encap(const char *short_name);
WS_DLL_PUBLIC
const char* wtap_tsprec_string(int tsprec);
@@ -2109,7 +2109,7 @@ WS_DLL_PUBLIC
void wtap_deregister_file_type_subtype(const int file_type_subtype);
WS_DLL_PUBLIC
-int wtap_register_encap_type(const char* name, const char* short_name);
+int wtap_register_encap_type(const char *description, const char *name);
/*** Cleanup the interal library structures */
WS_DLL_PUBLIC