diff options
author | Michael Mann <mmann78@netscape.net> | 2016-06-05 22:24:47 -0400 |
---|---|---|
committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-06-06 06:03:58 +0000 |
commit | 57ef06e242dbbce390547d9711f810fc60829219 (patch) | |
tree | eaadf36f96023dd59c3fd56565bf6e14c9e57431 /wiretap | |
parent | 6333b98ea6f7733b150537cbba6f80f3e2d83d43 (diff) |
*_stdup_printf -> strdup for "single string only" formatting.
Done for performance improvements.
This could probably be done in checkAPIs.pl, but this was just
a quick manual check with grepping.
Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d
Reviewed-on: https://code.wireshark.org/review/15751
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/btsnoop.c | 6 | ||||
-rw-r--r-- | wiretap/dct3trace.c | 4 | ||||
-rw-r--r-- | wiretap/erf.c | 2 | ||||
-rw-r--r-- | wiretap/netmon.c | 2 | ||||
-rw-r--r-- | wiretap/ngsniffer.c | 4 | ||||
-rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
-rw-r--r-- | wiretap/pcapng.c | 6 | ||||
-rw-r--r-- | wiretap/peektagged.c | 2 | ||||
-rw-r--r-- | wiretap/vms.c | 6 |
9 files changed, 17 insertions, 17 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index c443723e9e..ac48c3b5f3 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -120,18 +120,18 @@ wtap_open_return_val btsnoop_open(wtap *wth, int *err, gchar **err_info) break; case KHciLoggerDatalinkTypeBCSP: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: BCSP capture logs unsupported"); + *err_info = g_strdup("btsnoop: BCSP capture logs unsupported"); return WTAP_OPEN_ERROR; case KHciLoggerDatalinkTypeH5: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: H5 capture logs unsupported"); + *err_info = g_strdup("btsnoop: H5 capture logs unsupported"); return WTAP_OPEN_ERROR; case KHciLoggerDatalinkLinuxMonitor: file_encap=WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR; break; case KHciLoggerDatalinkBlueZ5Simulator: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: BlueZ 5 Simulator capture logs unsupported"); + *err_info = g_strdup("btsnoop: BlueZ 5 Simulator capture logs unsupported"); return WTAP_OPEN_ERROR; default: *err = WTAP_ERR_UNSUPPORTED; diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 81a4970105..e7987f62b6 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -226,7 +226,7 @@ static gboolean dct3trace_get_packet(FILE_T fh, struct wtap_pkthdr *phdr, { /* If not got any data return error */ *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("dct3trace: record without data"); + *err_info = g_strdup("dct3trace: record without data"); return FALSE; } } @@ -338,7 +338,7 @@ static gboolean dct3trace_get_packet(FILE_T fh, struct wtap_pkthdr *phdr, baddata: *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("dct3trace: record missing mandatory attributes"); + *err_info = g_strdup("dct3trace: record missing mandatory attributes"); return FALSE; } diff --git a/wiretap/erf.c b/wiretap/erf.c index b31562b0f5..04a1bb5be8 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -520,7 +520,7 @@ static gboolean erf_read_header(wtap *wth, FILE_T fh, /* If this isn't a pad record, it's a corrupt packet; bail out */ if ((erf_header->type & 0x7F) != ERF_TYPE_PAD) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("erf: File has 0 byte packet"); + *err_info = g_strdup("erf: File has 0 byte packet"); return FALSE; } diff --git a/wiretap/netmon.c b/wiretap/netmon.c index a7e2ea6eab..f258eac836 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -746,7 +746,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, */ if (!filetime_to_nstime(&phdr->ts, d)) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("netmon: time stamp outside supported range"); + *err_info = g_strdup("netmon: time stamp outside supported range"); return FAILURE; } } diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index da5929885c..3d78c3d57b 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -597,7 +597,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) if (type != REC_VERS) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("ngsniffer: Sniffer file doesn't start with a version record"); + *err_info = g_strdup("ngsniffer: Sniffer file doesn't start with a version record"); return WTAP_OPEN_ERROR; } @@ -892,7 +892,7 @@ process_rec_header2_v2(wtap *wth, unsigned char *buffer, guint16 length, * There's not enough data to compare. */ *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("ngsniffer: WAN capture has too-short protocol list"); + *err_info = g_strdup("ngsniffer: WAN capture has too-short protocol list"); return -1; } diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 8ce6c6ef7c..16e3589b8c 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1738,7 +1738,7 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, case WTAP_ENCAP_NFC_LLCP: if (check_packet_size && packet_size < LLCP_HEADER_LEN) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("pcap: libpcap llcp file too short"); + *err_info = g_strdup("pcap: libpcap llcp file too short"); return -1; } if (!pcap_read_llcp_pseudoheader(fh, &phdr->pseudo_header, err, err_info)) diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 4ff3afeaa2..a91b35c8c8 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -562,7 +562,7 @@ pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh, /* We currently only suport one SHB */ if (pn->shb_read == TRUE) { *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("pcapng_read_section_header_block: multiple section header blocks not supported"); + *err_info = g_strdup("pcapng_read_section_header_block: multiple section header blocks not supported"); return PCAPNG_BLOCK_ERROR; } @@ -1407,7 +1407,7 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t * if (0 >= pn->interfaces->len) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("pcapng_read_simple_packet_block: SPB appeared before any IDBs"); + *err_info = g_strdup("pcapng_read_simple_packet_block: SPB appeared before any IDBs"); return FALSE; } iface_info = g_array_index(pn->interfaces, interface_info_t, 0); @@ -2584,7 +2584,7 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wth->phdr.pkt_encap = WTAP_ENCAP_UNKNOWN; wth->phdr.pkt_tsprec = WTAP_TSPREC_UNKNOWN; *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("pcapng: multi-section files not currently supported"); + *err_info = g_strdup("pcapng: multi-section files not currently supported"); return FALSE; case(BLOCK_TYPE_PB): diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 24eaad1406..25ed2e29d9 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -734,7 +734,7 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, t = (((guint64) timestamp.upper) << 32) + timestamp.lower; if (!nsfiletime_to_nstime(&phdr->ts, t)) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("peektagged: time stamp outside supported range"); + *err_info = g_strdup("peektagged: time stamp outside supported range"); return -1; } diff --git a/wiretap/vms.c b/wiretap/vms.c index 2133c7802d..e9fc9a423a 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -371,7 +371,7 @@ parse_vms_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gch /* We will need to add code to handle new format */ if (num_items_scanned != 8) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("vms: header line not valid"); + *err_info = g_strdup("vms: header line not valid"); return FALSE; } } @@ -382,7 +382,7 @@ parse_vms_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gch if ( !*p ) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("vms: Length field not valid"); + *err_info = g_strdup("vms: Length field not valid"); return FALSE; } @@ -446,7 +446,7 @@ parse_vms_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gch if (!parse_single_hex_dump_line(line, pd, i, offset, pkt_len - i)) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("vms: hex dump not valid"); + *err_info = g_strdup("vms: hex dump not valid"); return FALSE; } } |