Changeset 1b11576d in mainline for uspace/lib/c/generic/adt/dynamic_fifo.c

Timestamp:

2010-10-23T16:04:12Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade

Children:

c77b4d6

Parents:

84c20da (diff), 58b833c (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 mainline changes.

File:

• uspace/lib/c/generic/adt/dynamic_fifo.c (modified) (5 diffs)

uspace/lib/c/generic/adt/dynamic_fifo.c

@@ -28 +28 @@
 
 /** @addtogroup libc
- *  @{
+ * @{
  */
 
@@ -34 +34 @@
  * Dynamic first in first out positive integer queue implementation.
  */
+
+#include <adt/dynamic_fifo.h>
 
 #include <errno.h>
 #include <malloc.h>
 #include <mem.h>
-
-#include <adt/dynamic_fifo.h>
 
 /** Internal magic value for a consistency check. */
@@ -106 +106 @@
 int dyn_fifo_push(dyn_fifo_ref fifo, int value, int max_size)
 {
-        int * new_items;
+        int *new_items;
 
         if (!dyn_fifo_is_valid(fifo))
@@ -149 +149 @@
 /** Returns and excludes the first item in the queue.
  *
- * @param[in,out] fifoi The dynamic queue.
+ * @param[in,out] fifo  The dynamic queue.
  * @returns             Value of the first item in the queue.
  * @returns             EINVAL if the queue is not valid.
@@ -189 +189 @@
 /** Clears and destroys the queue.
  *
- *  @param[in,out] fifo         The dynamic queue.
- *  @returns                    EOK on success.
- *  @returns                    EINVAL if the queue is not valid.
+ * @param[in,out] fifo  The dynamic queue.
+ * @returns             EOK on success.
+ * @returns             EINVAL if the queue is not valid.
  */
 int dyn_fifo_destroy(dyn_fifo_ref fifo)