From ccf495a8382bf62f8f90d1239dddb7c536aeface Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 20 Apr 2018 09:46:58 -0700 Subject: Fix cpu_diag_eventid_fix_names table. For a value_string_ext, the values must be in numerical order. Change-Id: I43063b59a8c15d7d1fcdca07d4ae9fd89917427d Reviewed-on: https://code.wireshark.org/review/27058 Reviewed-by: Guy Harris --- epan/dissectors/packet-s7comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-s7comm.c') diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index ba82ab8d33..7ebd7d6cab 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -1724,8 +1724,8 @@ static const value_string cpu_diag_eventid_fix_names[] = { { 0x3961, "Module/interface module removed, cannot be addressed" }, { 0x3966, "Module cannot be addressed, load voltage error" }, { 0x3968, "Module reconfiguration has ended with error" }, - { 0x3984, "Interface module removed" }, { 0x3981, "Interface error entering state" }, + { 0x3984, "Interface module removed" }, { 0x3986, "Performance of an H-Sync link negatively affected" }, { 0x39B1, "I/O access error when updating the process image input table" }, { 0x39B2, "I/O access error when transferring the process image to the output modules" }, @@ -1901,8 +1901,8 @@ static const value_string cpu_diag_eventid_fix_names[] = { { 0x59A3, "Error when downloading the integrated technology" }, { 0x6253, "Firmware update: End of firmware download over the network" }, { 0x6316, "Interface error when starting programmable controller" }, - { 0x6390, "Formatting of Micro Memory Card complete" }, { 0x6353, "Firmware update: Start of firmware download over the network" }, + { 0x6390, "Formatting of Micro Memory Card complete" }, { 0x6500, "Connection ID exists twice on module" }, { 0x6501, "Connection resources inadequate" }, { 0x6502, "Error in the connection description" }, @@ -1964,8 +1964,8 @@ static const value_string cpu_diag_eventid_fix_names[] = { { 0x73C1, "Update process canceled" }, { 0x73C2, "Updating aborted due to monitoring time being exceeded during the n-th attempt (1 = n = max. possible number of update attempts after abort due to excessive monitoring time)" }, { 0x73D8, "Safety mode disabled" }, - { 0x73E0, "Loss of redundancy in communication" }, { 0x73DB, "Safety program: safety mode enabled" }, + { 0x73E0, "Loss of redundancy in communication" }, { 0x74DD, "Safety program: Shutdown of a fail-save runtime group disabled" }, { 0x74DE, "Safety program: Shutdown of the F program disabled" }, { 0x74DF, "Start of F program initialization" }, -- cgit v1.2.3