Changeset 3fbce97 for protocols/oscar/rxqueue.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 parson

File:

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

protocols/oscar/rxqueue.c

@@ -361 +361 @@
 /*
  * Grab a single command sequence off the socket, and enqueue
- * it in the incoming event queue in a seperate struct.
+ * it in the incoming event queue in a separate struct.
  */
 int aim_get_command(aim_session_t *sess, aim_conn_t *conn)
@@ -479 +479 @@
 
 /*
- * Purge recieve queue of all handled commands (->handled==1).  Also
+ * Purge receive queue of all handled commands (->handled==1).  Also
  * allows for selective freeing using ->nofree so that the client can
  * keep the data for various purposes.