aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2013-12-22 15:47:17 +0000
committerBill Meier <wmeier@newsguy.com>2013-12-22 15:47:17 +0000
commite348c13deb255db357154dc066f32cc7c178da78 (patch)
treec0bc4e0d52e3dd665bd7245f730273e9e21bc453
parent523abb73f8279b95c6c51b10c3a54d1b71a25064 (diff)
(Trivial)
- Minor whitespace changes; - Fix a typo; - Add editor modelines to tnbuff_subset.c svn path=/trunk/; revision=54364
-rw-r--r--epan/tvbuff.c8
-rw-r--r--epan/tvbuff.h4
-rw-r--r--epan/tvbuff_subset.c16
3 files changed, 21 insertions, 7 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 9ed18343c0..406d8ccd16 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -107,7 +107,7 @@ tvb_free_chain(tvbuff_t *tvb)
tvbuff_t *next_tvb;
DISSECTOR_ASSERT(tvb);
while (tvb) {
- next_tvb=tvb->next;
+ next_tvb = tvb->next;
tvb_free_internal(tvb);
tvb = next_tvb;
}
@@ -136,7 +136,7 @@ tvb_add_to_chain(tvbuff_t *parent, tvbuff_t *child)
tmp->next = parent->next;
parent->next = tmp;
- }
+ }
}
/*
@@ -1751,7 +1751,7 @@ tvb_memeql(tvbuff_t *tvb, const gint offset, const guint8 *str, size_t size)
/* XXX: This has been replaced by tvb_get_string() */
char *
tvb_get_faked_unicode(wmem_allocator_t *scope, tvbuff_t *tvb, int offset,
- const int len, const gboolean little_endian)
+ const int len, const gboolean little_endian)
{
char *buffer;
int i;
@@ -3152,7 +3152,7 @@ tvb_find_tvb(tvbuff_t *haystack_tvb, tvbuff_t *needle_tvb, const gint haystack_o
gint
tvb_raw_offset(tvbuff_t *tvb)
{
- return ((tvb->raw_offset==-1)?(tvb->raw_offset = tvb_offset_from_real_beginning(tvb)):tvb->raw_offset);
+ return ((tvb->raw_offset==-1) ? (tvb->raw_offset = tvb_offset_from_real_beginning(tvb)) : tvb->raw_offset);
}
void
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 43f13d7792..55236f08b1 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -150,7 +150,7 @@ WS_DLL_PUBLIC void tvb_set_free_cb(tvbuff_t *tvb, const tvbuff_free_cb_t func);
/** Attach a TVBUFF_REAL_DATA tvbuff to a parent tvbuff. This connection
* is used during a tvb_free_chain()... the "child" TVBUFF_REAL_DATA acts
- * as if is part of the chain-of-creation of the parent tvbuff, although it
+ * as if it is part of the chain-of-creation of the parent tvbuff, although it
* isn't. This is useful if you need to take the data from some tvbuff,
* run some operation on it, like decryption or decompression, and make a new
* tvbuff from it, yet want the new tvbuff to be part of the chain. The reality
@@ -702,7 +702,7 @@ extern tvbuff_t *tvb_child_uncompress(tvbuff_t *parent, tvbuff_t *tvb,
/* From tvbuff_base64.c */
/** Return a tvb that contains the binary representation of a base64
- * string
+ * string
*/
extern tvbuff_t* base64_to_tvb(tvbuff_t *parent, const char *base64);
diff --git a/epan/tvbuff_subset.c b/epan/tvbuff_subset.c
index 3370ee070f..225162f85c 100644
--- a/epan/tvbuff_subset.c
+++ b/epan/tvbuff_subset.c
@@ -225,7 +225,7 @@ tvbuff_t *
tvb_new_proxy(tvbuff_t *backing)
{
tvbuff_t *tvb;
-
+
if (backing)
tvb = tvb_new_with_subset(backing, backing->reported_length, 0, backing->length);
else
@@ -235,3 +235,17 @@ tvb_new_proxy(tvbuff_t *backing)
return tvb;
}
+
+
+/*
+ * 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:
+ */