Changeset 29ff5c2 for protocols/oscar/tlv.c

Timestamp:

2015-11-21T00:01:50Z (9 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

File:

• protocols/oscar/tlv.c (modified) (2 diffs)

protocols/oscar/tlv.c

@@ -25 +25 @@
  * bstream references, so that at least the ->value portion of each
  * element doesn't need to be malloc/memcpy'd.  This could prove to be
- * just as effecient as the in-place TLV parsing used in a couple places
+ * just as efficient as the in-place TLV parsing used in a couple places
  * in libfaim.
  *
@@ -135 +135 @@
 /**
  * aim_addtlvtochain_str - Add a string to a TLV chain
- * @list: Desination chain (%NULL pointer if empty)
+ * @list: Designation chain (%NULL pointer if empty)
  * @type: TLV type
  * @str: String to add