Changeset 1916d1f in mainline for uspace/lib/posix/stdio/scanf.c

Timestamp:

2011-07-12T13:41:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

50fc490

Parents:

11809eab (diff), 6817eba (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 libposix changes.

File:

• uspace/lib/posix/stdio/scanf.c (modified) (5 diffs)

uspace/lib/posix/stdio/scanf.c

@@ -115 +115 @@
         /* Caller could already pre-allocated the window. */
         assert((self->window == NULL && self->window_size == 0) ||
-                (self->window && self->window_size > 0));
+            (self->window && self->window_size > 0));
 
         /* Initialize internal structures. */
         self->consumed = 0;
         ssize_t fetched = posix_getline(
-                &self->window, &self->window_size, self->source.stream);
+            &self->window, &self->window_size, self->source.stream);
         if (fetched != -1) {
                 self->fetched = fetched;
@@ -159 +159 @@
                 if (*self->cursor == '\0') {
                         ssize_t fetched = posix_getline(&self->window,
-                                &self->window_size, self->source.stream);
+                            &self->window_size, self->source.stream);
                         if (fetched != -1) {
                                 self->fetched += fetched;
@@ -215 +215 @@
                 }
                 ssize_t fetched = posix_getline(&self->window,
-                        &self->window_size, self->source.stream);
+                    &self->window_size, self->source.stream);
                 if (fetched != -1) {
                         assert(fetched == 1);
@@ -267 +267 @@
                 /* Window was completely consumed, fetch new data. */
                 ssize_t fetched = posix_getline(&self->window,
-                        &self->window_size, self->source.stream);
+                    &self->window_size, self->source.stream);
                 if (fetched != -1) {
                         self->fetched += fetched;
@@ -1080 +1080 @@
                                 bool sane =
                                     width == -1 &&
-                                        length_mod == LMOD_NONE &&
-                                        assign_alloc == false &&
-                                        assign_supress == false;
+                                    length_mod == LMOD_NONE &&
+                                    assign_alloc == false &&
+                                    assign_supress == false;
 
                                 if (sane) {