From 23dd596bcebc74cb78d594db29f50fed93dc1a52 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 7 Nov 2015 15:17:03 -0800 Subject: Renames to avoid collisons with read() and write() routines. (And with #defines of read as _read and write as _write on Windows, which might make structure members have surprising names if you try to look at them in a debugger.) Change-Id: Iaab5622cbde216d5fedd4bc014c83e4eef95f8a0 Reviewed-on: https://code.wireshark.org/review/11631 Reviewed-by: Guy Harris --- wiretap/pcapng.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 3e6739c59c..5ccaed3fb5 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -318,15 +318,15 @@ typedef struct { * out a block. */ typedef struct { - block_reader read; - block_writer write; + block_reader reader; + block_writer writer; } block_handler; static GHashTable *block_handlers; void -register_pcapng_block_type_handler(guint block_type, block_reader read, - block_writer write) +register_pcapng_block_type_handler(guint block_type, block_reader reader, + block_writer writer) { block_handler *handler; @@ -342,8 +342,8 @@ register_pcapng_block_type_handler(guint block_type, block_reader read, NULL, g_free); } handler = (block_handler *)g_malloc(sizeof *handler); - handler->read = read; - handler->write = write; + handler->reader = reader; + handler->writer = writer; (void)g_hash_table_insert(block_handlers, GUINT_TO_POINTER(block_type), handler); } @@ -2190,9 +2190,9 @@ pcapng_read_unknown_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn _U_ (handler = (block_handler *)g_hash_table_lookup(block_handlers, GUINT_TO_POINTER(bh->block_type))) != NULL) { /* Yes - call it to read this block type. */ - if (!handler->read(fh, block_read, pn->byte_swapped, - wblock->packet_header, wblock->frame_buffer, - err, err_info)) + if (!handler->reader(fh, block_read, pn->byte_swapped, + wblock->packet_header, wblock->frame_buffer, + err, err_info)) return FALSE; } else #endif @@ -3889,7 +3889,7 @@ static gboolean pcapng_dump(wtap_dumper *wdh, (handler = (block_handler *)g_hash_table_lookup(block_handlers, GUINT_TO_POINTER(pseudo_header->ftsrec.record_type))) != NULL) { /* Yes. Call it to write out this record. */ - if (!handler->write(wdh, phdr, pd, err)) + if (!handler->writer(wdh, phdr, pd, err)) return FALSE; } else #endif -- cgit v1.2.3