diff options
author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-01-06 16:34:52 +0100 |
---|---|---|
committer | Graham Bloice <graham.bloice@trihedral.com> | 2016-01-06 16:45:23 +0000 |
commit | 20a2fe23882e1b4dd3c460e3206e439af41ca73f (patch) | |
tree | 3775ef5f1de05332b461844bef6b95f5dc73779f /epan/dissectors/packet-osc.c | |
parent | 57acc227f08fd05fb20b577568780deff77f972f (diff) |
[OSC] rename variable 'system' to 'system_msg'.
* rename 'system' variable to 'system_msg'.
* change 'system' variable type to gboolean.
Fixes compile error on OSX.
Change-Id: I772b3126e6f7ebdab0797eaac223787956e02aef
Reviewed-on: https://code.wireshark.org/review/13075
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'epan/dissectors/packet-osc.c')
-rw-r--r-- | epan/dissectors/packet-osc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c index 86fbd9c4ec..bb2004ecf3 100644 --- a/epan/dissectors/packet-osc.c +++ b/epan/dissectors/packet-osc.c @@ -551,7 +551,7 @@ dissect_osc_message(tvbuff_t *tvb, proto_item *ti, proto_tree *osc_tree, gint of guint8 data2; guint8 status; guint8 channel; - guint8 system; + gboolean system_msg; guint8 status_shifted; port = tvb_get_guint8(tvb, offset); @@ -562,15 +562,15 @@ dissect_osc_message(tvbuff_t *tvb, proto_item *ti, proto_tree *osc_tree, gint of status = command & 0xF0; channel = command & 0x0F; - system = status == 0xF0; /* is system message */ + system_msg = status == 0xF0; /* is system message */ status_shifted = status >> 4; - if(system) + if(system_msg) status_str = val_to_str_ext_const(command, &MIDI_system_ext, "Unknown"); else status_str = val_to_str_ext_const(status_shifted, &MIDI_status_ext, "Unknown"); - if(system) + if(system_msg) { mi = proto_tree_add_none_format(message_tree, hf_osc_message_midi_type, tvb, offset, 4, "MIDI: Port %i, %s, %i, %i", @@ -625,7 +625,7 @@ dissect_osc_message(tvbuff_t *tvb, proto_item *ti, proto_tree *osc_tree, gint of proto_tree_add_item(midi_tree, hf_osc_message_midi_port_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - if(system) + if(system_msg) { proto_tree_add_item(midi_tree, hf_osc_message_midi_system_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; |