diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-24 14:32:28 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-24 22:32:46 +0000 |
| commit | c4b76a94ef9a6ca780d861a3eeb0d12230ef8c0c (patch) | |
| tree | 63579f099c1910d82021965ae618f9f576bca427 /wiretap/netscaler.c | |
| parent | 0dc5edfe9588e6cc243e432dccdcdd3395481c0e (diff) | |
More indentation cleanups.
Change-Id: Ia448727e6340723800d92097f0ef7f3582ef6340
Reviewed-on: https://code.wireshark.org/review/7359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/netscaler.c')
| -rw-r--r-- | wiretap/netscaler.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index b5ba7fd48c..f1f184799f 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -1193,46 +1193,46 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 * #define PACKET_DESCRIBE(phdr,FPTIMEDEF,SIZEDEF,ver,enumprefix,type,structname,TYPE)\ do {\ - nspr_##structname##_t *fp = (nspr_##structname##_t *) &nstrace_buf[nstrace_buf_offset];\ - (phdr)->rec_type = REC_TYPE_PACKET;\ - TIMEDEFV##ver(fp,type);\ - SIZEDEF##ver((phdr),fp,ver);\ - TRACE_V##ver##_REC_LEN_OFF((phdr),enumprefix,type,structname);\ - (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##TYPE;\ - ws_buffer_assure_space(wth->frame_buffer, (phdr)->caplen);\ - *data_offset = nstrace->xxx_offset + nstrace_buf_offset;\ - while (nstrace_tmpbuff_off < nspr_##structname##_s) {\ - nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\ - }\ - nst_dataSize = nspr_getv20recordsize(hdp);\ - rec_size = nst_dataSize - nstrace_tmpbuff_off;\ - nsg_nextPageOffset = ((nstrace_buf_offset + rec_size) >= NSPR_PAGESIZE_TRACE) ?\ - ((nstrace_buf_offset + rec_size) - (NSPR_PAGESIZE_TRACE - 1)) : 0;\ - while (nsg_nextPageOffset) {\ - while (nstrace_buf_offset < NSPR_PAGESIZE_TRACE) {\ + nspr_##structname##_t *fp = (nspr_##structname##_t *) &nstrace_buf[nstrace_buf_offset];\ + (phdr)->rec_type = REC_TYPE_PACKET;\ + TIMEDEFV##ver(fp,type);\ + SIZEDEF##ver((phdr),fp,ver);\ + TRACE_V##ver##_REC_LEN_OFF((phdr),enumprefix,type,structname);\ + (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##TYPE;\ + ws_buffer_assure_space(wth->frame_buffer, (phdr)->caplen);\ + *data_offset = nstrace->xxx_offset + nstrace_buf_offset;\ + while (nstrace_tmpbuff_off < nspr_##structname##_s) {\ nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\ }\ - nstrace_buflen = NSPR_PAGESIZE_TRACE;\ - nstrace->xxx_offset += nstrace_buflen;\ - bytes_read = file_read(nstrace_buf, NSPR_PAGESIZE_TRACE, wth->fh);\ - if (bytes_read != NSPR_PAGESIZE_TRACE) {\ - return FALSE;\ - } else {\ - nstrace_buf_offset = 0;\ - }\ + nst_dataSize = nspr_getv20recordsize(hdp);\ rec_size = nst_dataSize - nstrace_tmpbuff_off;\ nsg_nextPageOffset = ((nstrace_buf_offset + rec_size) >= NSPR_PAGESIZE_TRACE) ?\ - ((nstrace_buf_offset + rec_size) - (NSPR_PAGESIZE_TRACE- 1)): 0;\ - } \ - while (nstrace_tmpbuff_off < nst_dataSize) {\ - nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\ - }\ - memcpy(ws_buffer_start_ptr(wth->frame_buffer), nstrace_tmpbuff, (phdr)->caplen);\ - nstrace->nstrace_buf_offset = nstrace_buf_offset;\ - nstrace->nstrace_buflen = nstrace_buflen = ((gint32)NSPR_PAGESIZE_TRACE);\ - nstrace->nsg_creltime = nsg_creltime;\ - return TRUE;\ -} while(0) + ((nstrace_buf_offset + rec_size) - (NSPR_PAGESIZE_TRACE - 1)) : 0;\ + while (nsg_nextPageOffset) {\ + while (nstrace_buf_offset < NSPR_PAGESIZE_TRACE) {\ + nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\ + }\ + nstrace_buflen = NSPR_PAGESIZE_TRACE;\ + nstrace->xxx_offset += nstrace_buflen;\ + bytes_read = file_read(nstrace_buf, NSPR_PAGESIZE_TRACE, wth->fh);\ + if (bytes_read != NSPR_PAGESIZE_TRACE) {\ + return FALSE;\ + } else {\ + nstrace_buf_offset = 0;\ + }\ + rec_size = nst_dataSize - nstrace_tmpbuff_off;\ + nsg_nextPageOffset = ((nstrace_buf_offset + rec_size) >= NSPR_PAGESIZE_TRACE) ?\ + ((nstrace_buf_offset + rec_size) - (NSPR_PAGESIZE_TRACE- 1)): 0;\ + } \ + while (nstrace_tmpbuff_off < nst_dataSize) {\ + nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\ + }\ + memcpy(ws_buffer_start_ptr(wth->frame_buffer), nstrace_tmpbuff, (phdr)->caplen);\ + nstrace->nstrace_buf_offset = nstrace_buf_offset;\ + nstrace->nstrace_buflen = nstrace_buflen = ((gint32)NSPR_PAGESIZE_TRACE);\ + nstrace->nsg_creltime = nsg_creltime;\ + return TRUE;\ + } while(0) static gboolean nstrace_read_v30(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { |