diff options
author | João Valverde <j@v6e.pt> | 2021-12-18 18:48:20 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2021-12-19 21:21:58 +0000 |
commit | 0ccd69e530ed18ac19a4484c76bdbef94d1ab2b1 (patch) | |
tree | ffb5f202b47fbead8ff87e573afd72c856c91ae0 /wiretap/commview.c | |
parent | f984def50cfb20c5a47f7ac41b7b72bd270f2bb7 (diff) |
Replace g_strdup_printf() with ws_strdup_printf()
Use macros from inttypes.h.
Diffstat (limited to 'wiretap/commview.c')
-rw-r--r-- | wiretap/commview.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/commview.c b/wiretap/commview.c index a30e613c57..6f4ebbad71 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -302,7 +302,7 @@ commview_ncf_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, default : *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("commview: unsupported encap for NCF: %u", + *err_info = ws_strdup_printf("commview: unsupported encap for NCF: %u", cv_hdr.flags & FLAGS_MEDIUM); return FALSE; } @@ -803,7 +803,7 @@ commview_ncfx_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, */ if (length_remaining < COMMVIEW_NCFX_RF_HEADER_SIZE) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("commview: RF header goes past the NCFX data length %u", + *err_info = ws_strdup_printf("commview: RF header goes past the NCFX data length %u", cv_hdr.data_len); return FALSE; } @@ -908,7 +908,7 @@ commview_ncfx_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, */ if (length_remaining < COMMVIEW_NCFX_MCS_HEADER_SIZE) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("commview: MCS header goes past the NCFX data length %u", + *err_info = ws_strdup_printf("commview: MCS header goes past the NCFX data length %u", cv_hdr.data_len); return FALSE; } @@ -990,7 +990,7 @@ commview_ncfx_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, default : *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("commview: unsupported encap for NCFX: %u", + *err_info = ws_strdup_printf("commview: unsupported encap for NCFX: %u", cv_hdr.medium_type); return FALSE; } @@ -1013,7 +1013,7 @@ commview_ncfx_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, * to allocate space for an immensely-large packet. */ *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("commview: File has %u-byte packet, bigger than maximum of %u", + *err_info = ws_strdup_printf("commview: File has %u-byte packet, bigger than maximum of %u", length_remaining, WTAP_MAX_PACKET_SIZE_STANDARD); return FALSE; } @@ -1059,7 +1059,7 @@ commview_ncfx_read_header(commview_ncfx_header_t *cv_hdr, FILE_T fh, int *err, /* It must be at least the length of the general header. */ if (cv_hdr->data_len < COMMVIEW_NCFX_HEADER_SIZE) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("commview: NCFX data length %u < %u", + *err_info = ws_strdup_printf("commview: NCFX data length %u < %u", cv_hdr->data_len, COMMVIEW_NCFX_HEADER_SIZE); return FALSE; |