diff options
Diffstat (limited to 'gl/read-file.c')
| -rw-r--r-- | gl/read-file.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/gl/read-file.c b/gl/read-file.c index 0997b2e387..cc82bab98c 100644 --- a/gl/read-file.c +++ b/gl/read-file.c @@ -1,5 +1,5 @@ /* read-file.c -- read file contents into a string - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. Written by Simon Josefsson and Bruno Haible. This program is free software; you can redistribute it and/or modify @@ -45,36 +45,36 @@ fread_file (FILE * stream, size_t * length) size_t requested; if (size + BUFSIZ + 1 > alloc) - { - char *new_buf; + { + char *new_buf; - alloc += alloc / 2; - if (alloc < size + BUFSIZ + 1) - alloc = size + BUFSIZ + 1; + alloc += alloc / 2; + if (alloc < size + BUFSIZ + 1) + alloc = size + BUFSIZ + 1; - new_buf = realloc (buf, alloc); - if (!new_buf) - { - save_errno = errno; - break; - } + new_buf = realloc (buf, alloc); + if (!new_buf) + { + save_errno = errno; + break; + } - buf = new_buf; - } + buf = new_buf; + } requested = alloc - size - 1; count = fread (buf + size, 1, requested, stream); size += count; if (count != requested) - { - save_errno = errno; - if (ferror (stream)) - break; - buf[size] = '\0'; - *length = size; - return buf; - } + { + save_errno = errno; + if (ferror (stream)) + break; + buf[size] = '\0'; + *length = size; + return buf; + } } free (buf); @@ -99,10 +99,10 @@ internal_read_file (const char *filename, size_t * length, const char *mode) if (fclose (stream) != 0) { if (out) - { - save_errno = errno; - free (out); - } + { + save_errno = errno; + free (out); + } errno = save_errno; return NULL; } |