Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Unified Diff: fusl/src/stdio/fgets.c

Issue 1714623002: [fusl] clang-format fusl (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: headers too Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: fusl/src/stdio/fgets.c
diff --git a/fusl/src/stdio/fgets.c b/fusl/src/stdio/fgets.c
index d3f9819e82eec3a5707805d5ae5b661a78adec30..cf967bbe644300291eb2bbd6db65b1c82d8334cc 100644
--- a/fusl/src/stdio/fgets.c
+++ b/fusl/src/stdio/fgets.c
@@ -1,46 +1,50 @@
#include "stdio_impl.h"
#include <string.h>
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
-
-char *fgets(char *restrict s, int n, FILE *restrict f)
-{
- char *p = s;
- unsigned char *z;
- size_t k;
- int c;
-
- FLOCK(f);
-
- if (n--<=1) {
- f->mode |= f->mode-1;
- FUNLOCK(f);
- if (n) return 0;
- *s = 0;
- return s;
- }
-
- while (n) {
- z = memchr(f->rpos, '\n', f->rend - f->rpos);
- k = z ? z - f->rpos + 1 : f->rend - f->rpos;
- k = MIN(k, n);
- memcpy(p, f->rpos, k);
- f->rpos += k;
- p += k;
- n -= k;
- if (z || !n) break;
- if ((c = getc_unlocked(f)) < 0) {
- if (p==s || !feof(f)) s = 0;
- break;
- }
- n--;
- if ((*p++ = c) == '\n') break;
- }
- if (s) *p = 0;
-
- FUNLOCK(f);
-
- return s;
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+char* fgets(char* restrict s, int n, FILE* restrict f) {
+ char* p = s;
+ unsigned char* z;
+ size_t k;
+ int c;
+
+ FLOCK(f);
+
+ if (n-- <= 1) {
+ f->mode |= f->mode - 1;
+ FUNLOCK(f);
+ if (n)
+ return 0;
+ *s = 0;
+ return s;
+ }
+
+ while (n) {
+ z = memchr(f->rpos, '\n', f->rend - f->rpos);
+ k = z ? z - f->rpos + 1 : f->rend - f->rpos;
+ k = MIN(k, n);
+ memcpy(p, f->rpos, k);
+ f->rpos += k;
+ p += k;
+ n -= k;
+ if (z || !n)
+ break;
+ if ((c = getc_unlocked(f)) < 0) {
+ if (p == s || !feof(f))
+ s = 0;
+ break;
+ }
+ n--;
+ if ((*p++ = c) == '\n')
+ break;
+ }
+ if (s)
+ *p = 0;
+
+ FUNLOCK(f);
+
+ return s;
}
weak_alias(fgets, fgets_unlocked);

Powered by Google App Engine
This is Rietveld 408576698