diff options
Diffstat (limited to 'epan/dissectors/packet-cemi.c')
| -rw-r--r-- | epan/dissectors/packet-cemi.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-cemi.c b/epan/dissectors/packet-cemi.c index c3741b8fea..0ac82c0ac2 100644 --- a/epan/dissectors/packet-cemi.c +++ b/epan/dissectors/packet-cemi.c @@ -1088,7 +1088,7 @@ static const guint8* decrypt_data_security_data( wmem_allocator_t *pool, const g gchar* output = info->output_text; gint output_max = sizeof info->output_text; - g_snprintf( output, output_max, "with " ); + snprintf( output, output_max, "with " ); while( *output ) { ++output; --output_max; } // Try keys from keyring.XML @@ -1107,7 +1107,7 @@ static const guint8* decrypt_data_security_data( wmem_allocator_t *pool, const g if( decrypted ) { - g_snprintf( output, output_max, "GA " ); + snprintf( output, output_max, "GA " ); while( *output ) { ++output; --output_max; } break; } @@ -1129,7 +1129,7 @@ static const guint8* decrypt_data_security_data( wmem_allocator_t *pool, const g if( decrypted ) { - g_snprintf( output, output_max, "dest IA " ); + snprintf( output, output_max, "dest IA " ); while( *output ) { ++output; --output_max; } break; } @@ -1152,7 +1152,7 @@ static const guint8* decrypt_data_security_data( wmem_allocator_t *pool, const g if( decrypted ) { - g_snprintf( output, output_max, "source IA " ); + snprintf( output, output_max, "source IA " ); while( *output ) { ++output; --output_max; } break; } @@ -1182,17 +1182,17 @@ static const guint8* decrypt_data_security_data( wmem_allocator_t *pool, const g { guint8 count; - g_snprintf( output, output_max, "key" ); + snprintf( output, output_max, "key" ); for( count = 16; count; --count ) { while( *output ) { ++output; --output_max; } - g_snprintf( output, output_max, " %02X", *key++ ); + snprintf( output, output_max, " %02X", *key++ ); } } else { - g_snprintf( info->output_text, sizeof info->output_text, keys_found ? "failed" : "no keys found" ); + snprintf( info->output_text, sizeof info->output_text, keys_found ? "failed" : "no keys found" ); } return decrypted; @@ -1712,8 +1712,8 @@ static void dissect_memory_ext_service( tvbuff_t* tvb, packet_info* pinfo, proto /* 3 bytes Memory Address */ guint32 x = tvb_get_guint24( tvb, offset + 1, ENC_BIG_ENDIAN ); - col_append_fstr( cinfo, COL_INFO, " X=$%06" G_GINT32_MODIFIER "X", x ); - proto_item_append_text( cemi_node, ", X=$%06" G_GINT32_MODIFIER "X", x ); + col_append_fstr( cinfo, COL_INFO, " X=$%06" PRIX32, x ); + proto_item_append_text( cemi_node, ", X=$%06" PRIX32, x ); if( is_response ) { @@ -2355,7 +2355,7 @@ static void dissect_data_security_service( tvbuff_t* tvb, packet_info* pinfo, pr { if( ia_seq->seq > seq_nr ) { - expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: min $%012" G_GINT64_MODIFIER "X", ia_seq->seq ); + expert_add_info_format( pinfo, node, KIP_ERROR, "Expected: min $%012" PRIX64, ia_seq->seq ); break; } } @@ -2888,7 +2888,7 @@ static void dissect_cemi_transport_layer( tvbuff_t* tvb, packet_info* pinfo, pro name = try_val_to_str( tc, tc_vals ); if( !name ) { - g_snprintf( text, sizeof text, "TC=%u", tc ); + snprintf( text, sizeof text, "TC=%u", tc ); name = text; } col_append_fstr( cinfo, COL_INFO, " %s", name ); @@ -3192,7 +3192,7 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr guint8 hc = (c & 0x70) >> 4; /* Hop Count */ guint8 eff = c & 0x0F; /* Extended Frame Format (0 = standard) */ - g_snprintf( text, sizeof text, "%u", (c & 0x70) >> 4 ); /* hop count */ + snprintf( text, sizeof text, "%u", (c & 0x70) >> 4 ); /* hop count */ proto_item_append_text( cemi_node, ", H=%u", hc ); node = proto_tree_add_none_format( cemi_list, hf_folder, tvb, offset, 1, "Ctrl2: Hops = %u", hc ); if( eff ) @@ -3220,7 +3220,7 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr else { source_addr = tvb_get_ntohs( tvb, offset ); - g_snprintf( text, sizeof text, "%u.%u.%u", (source_addr >> 12) & 0xF, (source_addr >> 8) & 0xF, source_addr & 0xFF ); + snprintf( text, sizeof text, "%u.%u.%u", (source_addr >> 12) & 0xF, (source_addr >> 8) & 0xF, source_addr & 0xFF ); col_append_fstr( cinfo, COL_INFO, " %s", text ); if( tree ) { @@ -3247,12 +3247,12 @@ static void dissect_cemi_link_layer( tvbuff_t* tvb, packet_info* pinfo, proto_tr if( unicast ) { /* Individual Address */ - g_snprintf( text, sizeof text, "%u.%u.%u", (dest_addr >> 12) & 0xF, (dest_addr >> 8) & 0xF, dest_addr & 0xFF ); + snprintf( text, sizeof text, "%u.%u.%u", (dest_addr >> 12) & 0xF, (dest_addr >> 8) & 0xF, dest_addr & 0xFF ); } else { /* Group Address */ - g_snprintf( text, sizeof text, "%u/%u/%u", (dest_addr >> 11) & 0x1F, (dest_addr >> 8) & 0x7, dest_addr & 0xFF ); + snprintf( text, sizeof text, "%u/%u/%u", (dest_addr >> 11) & 0x1F, (dest_addr >> 8) & 0x7, dest_addr & 0xFF ); } col_append_fstr( cinfo, COL_INFO, "->%s", text ); |