diff options
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-ha.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-ha.c | 86 |
1 files changed, 42 insertions, 44 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index 3c716ee724..7701314244 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -104,19 +104,19 @@ static void dissect_zcl_appl_idt_attr_data(proto_tree *tree, tvbuff_t *tvb, guin /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_appl_idt = -1; +static int proto_zbee_zcl_appl_idt; -static int hf_zbee_zcl_appl_idt_attr_id = -1; -static int hf_zbee_zcl_appl_idt_company_id = -1; -static int hf_zbee_zcl_appl_idt_brand_id = -1; -static int hf_zbee_zcl_appl_idt_string_len = -1; -static int hf_zbee_zcl_appl_idt_prod_type_name = -1; -static int hf_zbee_zcl_appl_idt_prod_type_id = -1; -static int hf_zbee_zcl_appl_idt_ceced_spec_ver = -1; +static int hf_zbee_zcl_appl_idt_attr_id; +static int hf_zbee_zcl_appl_idt_company_id; +static int hf_zbee_zcl_appl_idt_brand_id; +static int hf_zbee_zcl_appl_idt_string_len; +static int hf_zbee_zcl_appl_idt_prod_type_name; +static int hf_zbee_zcl_appl_idt_prod_type_id; +static int hf_zbee_zcl_appl_idt_ceced_spec_ver; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_appl_idt = -1; -static gint ett_zbee_zcl_appl_idt_basic = -1; +static gint ett_zbee_zcl_appl_idt; +static gint ett_zbee_zcl_appl_idt_basic; /* Attributes */ static const value_string zbee_zcl_appl_idt_attr_names[] = { @@ -226,7 +226,7 @@ dissect_zcl_appl_idt_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, g case ZBEE_ZCL_ATTR_ID_APPL_IDT_BASIC_IDENT: value64 = tvb_get_letoh56(tvb, *offset); sub_tree = proto_tree_add_subtree_format(tree, tvb, *offset, 8, ett_zbee_zcl_appl_idt_basic, NULL, - "Basic Identification: 0x%" G_GINT64_MODIFIER "x", value64); + "Basic Identification: 0x%" PRIx64, value64); proto_tree_add_item(sub_tree, hf_zbee_zcl_appl_idt_company_id, tvb, *offset, 2, ENC_LITTLE_ENDIAN); *offset += 2; @@ -405,14 +405,14 @@ static void dissect_zcl_met_idt_attr_data (proto_tree *tree, tvbuff_t *tvb, gui /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_met_idt = -1; +static int proto_zbee_zcl_met_idt; -static int hf_zbee_zcl_met_idt_attr_id = -1; -static int hf_zbee_zcl_met_idt_meter_type_id = -1; -static int hf_zbee_zcl_met_idt_data_quality_id = -1; +static int hf_zbee_zcl_met_idt_attr_id; +static int hf_zbee_zcl_met_idt_meter_type_id; +static int hf_zbee_zcl_met_idt_data_quality_id; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_met_idt = -1; +static gint ett_zbee_zcl_met_idt; /* Attributes */ static const value_string zbee_zcl_met_idt_attr_names[] = { @@ -625,22 +625,22 @@ static void dissect_zcl_appl_evtalt_event_notif (tvbuff_t *tvb, proto_ /* Global Variables */ /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_appl_evtalt = -1; - -static int hf_zbee_zcl_appl_evtalt_srv_tx_cmd_id = -1; -static int hf_zbee_zcl_appl_evtalt_srv_rx_cmd_id = -1; -static int hf_zbee_zcl_appl_evtalt_count_num = -1; -static int hf_zbee_zcl_appl_evtalt_count_type = -1; -static int hf_zbee_zcl_appl_evtalt_alert_id = -1; -static int hf_zbee_zcl_appl_evtalt_category = -1; -static int hf_zbee_zcl_appl_evtalt_status = -1; -static int hf_zbee_zcl_appl_evtalt_reserved = -1; -static int hf_zbee_zcl_appl_evtalt_proprietary = -1; -static int hf_zbee_zcl_appl_evtalt_event_hdr = -1; -static int hf_zbee_zcl_appl_evtalt_event_id = -1; +static int proto_zbee_zcl_appl_evtalt; + +static int hf_zbee_zcl_appl_evtalt_srv_tx_cmd_id; +static int hf_zbee_zcl_appl_evtalt_srv_rx_cmd_id; +static int hf_zbee_zcl_appl_evtalt_count_num; +static int hf_zbee_zcl_appl_evtalt_count_type; +static int hf_zbee_zcl_appl_evtalt_alert_id; +static int hf_zbee_zcl_appl_evtalt_category; +static int hf_zbee_zcl_appl_evtalt_status; +static int hf_zbee_zcl_appl_evtalt_reserved; +static int hf_zbee_zcl_appl_evtalt_proprietary; +static int hf_zbee_zcl_appl_evtalt_event_hdr; +static int hf_zbee_zcl_appl_evtalt_event_id; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_appl_evtalt = -1; +static gint ett_zbee_zcl_appl_evtalt; static gint ett_zbee_zcl_appl_evtalt_alerts_struct[ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT]; /* Server Commands Received */ @@ -902,7 +902,6 @@ proto_register_zbee_zcl_appl_evtalt(void) /* initialize attribute subtree types */ for ( i = 0, j = ZBEE_ZCL_APPL_EVTALT_NUM_GENERIC_ETT; i < ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT; i++, j++) { - ett_zbee_zcl_appl_evtalt_alerts_struct[i] = -1; ett[j] = &ett_zbee_zcl_appl_evtalt_alerts_struct[i]; } @@ -983,19 +982,19 @@ static void decode_zcl_appl_stats_utc_time (gchar *s, guint32 value /* Global Variables */ /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_appl_stats = -1; +static int proto_zbee_zcl_appl_stats; -static int hf_zbee_zcl_appl_stats_attr_id = -1; -static int hf_zbee_zcl_appl_stats_srv_tx_cmd_id = -1; -static int hf_zbee_zcl_appl_stats_srv_rx_cmd_id = -1; -static int hf_zbee_zcl_appl_stats_utc_time = -1; -static int hf_zbee_zcl_appl_stats_log_length = -1; -static int hf_zbee_zcl_appl_stats_log_payload = -1; -static int hf_zbee_zcl_appl_stats_log_queue_size = -1; -static int hf_zbee_zcl_appl_stats_log_id = -1; +static int hf_zbee_zcl_appl_stats_attr_id; +static int hf_zbee_zcl_appl_stats_srv_tx_cmd_id; +static int hf_zbee_zcl_appl_stats_srv_rx_cmd_id; +static int hf_zbee_zcl_appl_stats_utc_time; +static int hf_zbee_zcl_appl_stats_log_length; +static int hf_zbee_zcl_appl_stats_log_payload; +static int hf_zbee_zcl_appl_stats_log_queue_size; +static int hf_zbee_zcl_appl_stats_log_id; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_appl_stats = -1; +static gint ett_zbee_zcl_appl_stats; static gint ett_zbee_zcl_appl_stats_logs[ZBEE_ZCL_APPL_STATS_NUM_LOGS_ETT]; /* Attributes */ @@ -1194,12 +1193,12 @@ static void decode_zcl_appl_stats_utc_time(gchar *s, guint32 value) { if (value == ZBEE_ZCL_APPL_STATS_INVALID_TIME) - g_snprintf(s, ITEM_LABEL_LENGTH, "Invalid UTC Time"); + snprintf(s, ITEM_LABEL_LENGTH, "Invalid UTC Time"); else { gchar *utc_time; value += ZBEE_ZCL_NSTIME_UTC_OFFSET; utc_time = abs_time_secs_to_str (NULL, value, ABSOLUTE_TIME_LOCAL, TRUE); - g_snprintf(s, ITEM_LABEL_LENGTH, "%s", utc_time); + snprintf(s, ITEM_LABEL_LENGTH, "%s", utc_time); wmem_free(NULL, utc_time); } } /* decode_zcl_appl_stats_utc_time */ @@ -1256,7 +1255,6 @@ proto_register_zbee_zcl_appl_stats(void) /* initialize attribute subtree types */ for ( i = 0, j = ZBEE_ZCL_APPL_STATS_NUM_GENERIC_ETT; i < ZBEE_ZCL_APPL_STATS_NUM_LOGS_ETT; i++, j++ ) { - ett_zbee_zcl_appl_stats_logs[i] = -1; ett[j] = &ett_zbee_zcl_appl_stats_logs[i]; } |