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

Unified Diff: fusl/src/stdio/getdelim.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/getdelim.c
diff --git a/fusl/src/stdio/getdelim.c b/fusl/src/stdio/getdelim.c
index 1ccd8029238987f05e183c3bfec186287dff89f0..88ed87b70e2aca00b5ec718294ffc77c5f5538ed 100644
--- a/fusl/src/stdio/getdelim.c
+++ b/fusl/src/stdio/getdelim.c
@@ -3,66 +3,74 @@
#include <inttypes.h>
#include <errno.h>
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
-ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restrict f)
-{
- char *tmp;
- unsigned char *z;
- size_t k;
- size_t i=0;
- int c;
+ssize_t getdelim(char** restrict s,
+ size_t* restrict n,
+ int delim,
+ FILE* restrict f) {
+ char* tmp;
+ unsigned char* z;
+ size_t k;
+ size_t i = 0;
+ int c;
- FLOCK(f);
+ FLOCK(f);
- if (!n || !s) {
- f->flags |= F_ERR;
- FUNLOCK(f);
- errno = EINVAL;
- return -1;
- }
+ if (!n || !s) {
+ f->flags |= F_ERR;
+ FUNLOCK(f);
+ errno = EINVAL;
+ return -1;
+ }
- if (!*s) *n=0;
+ if (!*s)
+ *n = 0;
- for (;;) {
- z = memchr(f->rpos, delim, f->rend - f->rpos);
- k = z ? z - f->rpos + 1 : f->rend - f->rpos;
- if (i+k+1 >= *n) {
- if (k >= SIZE_MAX/2-i) goto oom;
- size_t m = i+k+2;
- if (!z && m < SIZE_MAX/4) m += m/2;
- tmp = realloc(*s, m);
- if (!tmp) {
- m = i+k+2;
- tmp = realloc(*s, m);
- if (!tmp) goto oom;
- }
- *s = tmp;
- *n = m;
- }
- memcpy(*s+i, f->rpos, k);
- f->rpos += k;
- i += k;
- if (z) break;
- if ((c = getc_unlocked(f)) == EOF) {
- if (!i || !feof(f)) {
- FUNLOCK(f);
- return -1;
- }
- break;
- }
- if (((*s)[i++] = c) == delim) break;
- }
- (*s)[i] = 0;
+ for (;;) {
+ z = memchr(f->rpos, delim, f->rend - f->rpos);
+ k = z ? z - f->rpos + 1 : f->rend - f->rpos;
+ if (i + k + 1 >= *n) {
+ if (k >= SIZE_MAX / 2 - i)
+ goto oom;
+ size_t m = i + k + 2;
+ if (!z && m < SIZE_MAX / 4)
+ m += m / 2;
+ tmp = realloc(*s, m);
+ if (!tmp) {
+ m = i + k + 2;
+ tmp = realloc(*s, m);
+ if (!tmp)
+ goto oom;
+ }
+ *s = tmp;
+ *n = m;
+ }
+ memcpy(*s + i, f->rpos, k);
+ f->rpos += k;
+ i += k;
+ if (z)
+ break;
+ if ((c = getc_unlocked(f)) == EOF) {
+ if (!i || !feof(f)) {
+ FUNLOCK(f);
+ return -1;
+ }
+ break;
+ }
+ if (((*s)[i++] = c) == delim)
+ break;
+ }
+ (*s)[i] = 0;
- FUNLOCK(f);
+ FUNLOCK(f);
- return i;
+ return i;
oom:
- f->flags |= F_ERR;
- FUNLOCK(f);
- errno = ENOMEM;
- return -1;
+ f->flags |= F_ERR;
+ FUNLOCK(f);
+ errno = ENOMEM;
+ return -1;
}
weak_alias(getdelim, __getdelim);

Powered by Google App Engine
This is Rietveld 408576698