diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
| commit | 853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch) | |
| tree | 94f8afdae71f496fe638550f9e2cea926195b8ee /epan | |
| parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (diff) | |
The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.
Rename various functions, #defines, and variables appropriately.
svn path=/trunk/; revision=53166
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/wslua/wslua_dumper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c index 8c923988c2..bdd29b9398 100644 --- a/epan/wslua/wslua_dumper.c +++ b/epan/wslua/wslua_dumper.c @@ -207,7 +207,7 @@ WSLUA_CONSTRUCTOR Dumper_new(lua_State* L) { #define WSLUA_OPTARG_Dumper_new_ENCAP 3 /* The encapsulation to be used in the file to be created */ Dumper d; const char* fname = luaL_checkstring(L,WSLUA_ARG_Dumper_new_FILENAME); - int filetype = luaL_optint(L,WSLUA_OPTARG_Dumper_new_FILETYPE,WTAP_FILE_PCAP); + int filetype = luaL_optint(L,WSLUA_OPTARG_Dumper_new_FILETYPE,WTAP_FILE_TYPE_SUBTYPE_PCAP); int encap = luaL_optint(L,WSLUA_OPTARG_Dumper_new_ENCAP,WTAP_ENCAP_ETHERNET); int err = 0; const char* filename; @@ -223,12 +223,12 @@ WSLUA_CONSTRUCTOR Dumper_new(lua_State* L) { switch (err) { case WTAP_ERR_UNSUPPORTED_FILE_TYPE: luaL_error(L,"Files of file type %s cannot be written", - wtap_file_type_string(filetype)); + wtap_file_type_subtype_string(filetype)); break; case WTAP_ERR_UNSUPPORTED_ENCAP: luaL_error(L,"Files of file type %s don't support encapsulation %s", - wtap_file_type_string(filetype), + wtap_file_type_subtype_string(filetype), wtap_encap_short_string(encap)); break; @@ -338,7 +338,7 @@ WSLUA_METHOD Dumper_new_for_current(lua_State* L) { #define WSLUA_OPTARG_Dumper_new_for_current_FILETYPE 2 /* The file type. Defaults to pcap. */ Dumper d; const char* fname = luaL_checkstring(L,1); - int filetype = luaL_optint(L,WSLUA_OPTARG_Dumper_new_for_current_FILETYPE,WTAP_FILE_PCAP); + int filetype = luaL_optint(L,WSLUA_OPTARG_Dumper_new_for_current_FILETYPE,WTAP_FILE_TYPE_SUBTYPE_PCAP); int encap; int err = 0; const char* filename; @@ -358,12 +358,12 @@ WSLUA_METHOD Dumper_new_for_current(lua_State* L) { switch (err) { case WTAP_ERR_UNSUPPORTED_FILE_TYPE: luaL_error(L,"Files of file type %s cannot be written", - wtap_file_type_string(filetype)); + wtap_file_type_subtype_string(filetype)); break; case WTAP_ERR_UNSUPPORTED_ENCAP: luaL_error(L,"Files of file type %s don't support encapsulation %s", - wtap_file_type_string(filetype), + wtap_file_type_subtype_string(filetype), wtap_encap_short_string(encap)); break; |