Skip to content

Commit

Permalink
Add editor modelines; Adjust whitespace as needed.
Browse files Browse the repository at this point in the history
Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50
Reviewed-on: https://code.wireshark.org/review/4594
Reviewed-by: Bill Meier <wmeier@newsguy.com>
  • Loading branch information
Bill Meier committed Oct 10, 2014
1 parent bdbc8e3 commit 23e78cd
Show file tree
Hide file tree
Showing 43 changed files with 1,064 additions and 516 deletions.
15 changes: 14 additions & 1 deletion epan/addr_and_mask.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ ipv4_addr_and_mask(tvbuff_t *tvb, int offset, guint8 *addr, guint32 prefix_len)

int
ipv6_addr_and_mask(tvbuff_t *tvb, int offset, struct e_in6_addr *addr,
guint32 prefix_len)
guint32 prefix_len)
{
guint32 addr_len;

Expand All @@ -90,3 +90,16 @@ ipv6_addr_and_mask(tvbuff_t *tvb, int offset, struct e_in6_addr *addr,

return addr_len;
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
13 changes: 13 additions & 0 deletions epan/aftypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,16 @@ static const value_string linux_af_vals[] = {
};

value_string_ext linux_af_vals_ext = VALUE_STRING_EXT_INIT(linux_af_vals);

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
29 changes: 21 additions & 8 deletions epan/app_mem_usage.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
static gsize
win32_get_total_mem_used_by_app(void)
{
HANDLE pHandle;
PROCESS_MEMORY_COUNTERS pmc;
SIZE_T workingSize = 0;
HANDLE pHandle;
PROCESS_MEMORY_COUNTERS pmc;
SIZE_T workingSize = 0;

pHandle = GetCurrentProcess();
pHandle = GetCurrentProcess();

if (GetProcessMemoryInfo(pHandle, &pmc, sizeof(pmc))){
workingSize = pmc.WorkingSetSize;
}
if (GetProcessMemoryInfo(pHandle, &pmc, sizeof(pmc))){
workingSize = pmc.WorkingSetSize;
}

CloseHandle(pHandle);
CloseHandle(pHandle);

if(workingSize == 0){
return -1;
Expand Down Expand Up @@ -211,3 +211,16 @@ memory_usage_gc(void)
}
}


/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
26 changes: 19 additions & 7 deletions epan/asm_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,24 @@ wrs_check_charset(const guchar table[256], const char *str)
guint
wrs_str_hash(gconstpointer v)
{
/* 31 bit hash function */
const signed char *p = (const signed char *)v;
guint32 h = *p;
if (h)
for (p += 1; *p != '\0'; p++)
h = (h << 5) - h + *p;
return h;
/* 31 bit hash function */
const signed char *p = (const signed char *)v;
guint32 h = *p;
if (h)
for (p += 1; *p != '\0'; p++)
h = (h << 5) - h + *p;
return h;
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/
13 changes: 13 additions & 0 deletions epan/asn1.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,16 @@ double asn1_get_real(const guint8 *real_ptr, gint real_len) {

return val;
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/
15 changes: 14 additions & 1 deletion epan/atalk-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
gchar *
atalk_addr_to_str(const struct atalk_ddp_addr *addrp)
{
gchar *cur;
gchar *cur;

cur=(gchar *)ep_alloc(14);
atalk_addr_to_str_buf(addrp, cur, 14);
Expand All @@ -38,3 +38,16 @@ atalk_addr_to_str_buf(const struct atalk_ddp_addr *addrp, gchar *buf, int buf_le
{
g_snprintf(buf, buf_len, "%u.%u", addrp->net, addrp->node );
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/
19 changes: 16 additions & 3 deletions epan/circuit.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ circuit_cleanup(void)
* Free up any space allocated for the circuit hashtable.
*
* We can free the hash as the structures pointed to in the
* hash are in "seasonal" memory which is freed separately.
* Note: circuit_cleanup() must be called only when
* seasonal memory is also freed.
* hash are in "seasonal" memory which is freed separately.
* Note: circuit_cleanup() must be called only when
* seasonal memory is also freed.
*/

if (circuit_hashtable != NULL)
Expand Down Expand Up @@ -306,3 +306,16 @@ try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame,
}
return FALSE;
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
13 changes: 13 additions & 0 deletions epan/crc10-tvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,16 @@ update_crc10_by_bytes_tvb(guint16 crc10, tvbuff_t *tvb, int offset, int len)

return update_crc10_by_bytes(crc10, buf, len);
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/
13 changes: 13 additions & 0 deletions epan/crc16-tvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,16 @@ guint16 crc16_0x3D65_tvb_offset_seed(tvbuff_t *tvb, guint offset, guint len, gui

return crc16_0x3D65_seed(buf, len, seed);
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/
31 changes: 22 additions & 9 deletions epan/crc32-tvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ crc32_802_tvb(tvbuff_t *tvb, guint len)

guint32
crc32_mpeg2_tvb_offset_seed(tvbuff_t *tvb, guint offset,
guint len, guint32 seed)
guint len, guint32 seed)
{
const guint8* buf;

Expand All @@ -126,28 +126,41 @@ crc32_mpeg2_tvb_offset_seed(tvbuff_t *tvb, guint offset,
guint32
crc32_mpeg2_tvb(tvbuff_t *tvb, guint len)
{
return ( crc32_mpeg2_tvb_offset_seed(tvb, 0, len, CRC32_MPEG2_SEED) );
return ( crc32_mpeg2_tvb_offset_seed(tvb, 0, len, CRC32_MPEG2_SEED) );
}

guint32
crc32_mpeg2_tvb_offset(tvbuff_t *tvb, guint offset, guint len)
{
return ( crc32_mpeg2_tvb_offset_seed(tvb, offset, len, CRC32_MPEG2_SEED) );
return ( crc32_mpeg2_tvb_offset_seed(tvb, offset, len, CRC32_MPEG2_SEED) );
}

guint32
crc32_mpeg2_tvb_seed(tvbuff_t *tvb, guint len, guint32 seed)
{
return ( crc32_mpeg2_tvb_offset_seed(tvb, 0, len, seed) );
return ( crc32_mpeg2_tvb_offset_seed(tvb, 0, len, seed) );
}

guint32 crc32_0x0AA725CF_tvb_offset_seed(tvbuff_t *tvb,
guint offset, guint len, guint32 seed)
guint offset, guint len, guint32 seed)
{
const guint8 *buf;
const guint8 *buf;

tvb_ensure_bytes_exist(tvb, offset, len); /* len == -1 not allowed */
buf = tvb_get_ptr(tvb, offset, len);
tvb_ensure_bytes_exist(tvb, offset, len); /* len == -1 not allowed */
buf = tvb_get_ptr(tvb, offset, len);

return crc32_0x0AA725CF_seed(buf, len, seed);
return crc32_0x0AA725CF_seed(buf, len, seed);
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
13 changes: 13 additions & 0 deletions epan/crc6-tvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,16 @@ crc6_compute_tvb(tvbuff_t *tvb, int len)

return crc6_compute(buf, len);
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/
45 changes: 29 additions & 16 deletions epan/crc8-tvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,22 @@
* Reversed CRC table
*****************************************************************************/
static const guint8 crctable[256] = { /*reversed, 8-bit, poly=0x07*/
0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75, 0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98, 0xEA, 0x7B,
0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69, 0x12, 0x83, 0xF1, 0x60, 0x15, 0x84, 0xF6, 0x67,
0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D, 0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0, 0xD2, 0x43,
0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51, 0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC, 0xCE, 0x5F,
0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05, 0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8, 0x9A, 0x0B,
0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19, 0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4, 0x86, 0x17,
0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D, 0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0, 0xA2, 0x33,
0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21, 0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC, 0xBE, 0x2F,
0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95, 0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78, 0x0A, 0x9B,
0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89, 0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64, 0x16, 0x87,
0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD, 0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40, 0x32, 0xA3,
0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1, 0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C, 0x2E, 0xBF,
0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5, 0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08, 0x7A, 0xEB,
0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9, 0x82, 0x13, 0x61, 0xF0, 0x85, 0x14, 0x66, 0xF7,
0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD, 0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30, 0x42, 0xD3,
0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1, 0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C, 0x5E, 0xCF
0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75, 0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98, 0xEA, 0x7B,
0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69, 0x12, 0x83, 0xF1, 0x60, 0x15, 0x84, 0xF6, 0x67,
0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D, 0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0, 0xD2, 0x43,
0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51, 0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC, 0xCE, 0x5F,
0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05, 0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8, 0x9A, 0x0B,
0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19, 0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4, 0x86, 0x17,
0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D, 0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0, 0xA2, 0x33,
0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21, 0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC, 0xBE, 0x2F,
0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95, 0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78, 0x0A, 0x9B,
0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89, 0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64, 0x16, 0x87,
0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD, 0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40, 0x32, 0xA3,
0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1, 0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C, 0x2E, 0xBF,
0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5, 0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08, 0x7A, 0xEB,
0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9, 0x82, 0x13, 0x61, 0xF0, 0x85, 0x14, 0x66, 0xF7,
0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD, 0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30, 0x42, 0xD3,
0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1, 0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C, 0x5E, 0xCF
};


Expand Down Expand Up @@ -94,3 +94,16 @@ guint8 get_crc8_ieee8023_epon(tvbuff_t *p, guint8 len, guint8 offset) {

return FCS;
}

/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
Loading

0 comments on commit 23e78cd

Please sign in to comment.