A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill all trailling whitespaces
[simgrid.git]
/
src
/
xbt
/
xbt_os_file.c
diff --git
a/src/xbt/xbt_os_file.c
b/src/xbt/xbt_os_file.c
index
46dd79a
..
789c141
100644
(file)
--- a/
src/xbt/xbt_os_file.c
+++ b/
src/xbt/xbt_os_file.c
@@
-36,10
+36,7
@@
*/
ssize_t xbt_getline(char **buf, size_t *n, FILE *stream)
{
*/
ssize_t xbt_getline(char **buf, size_t *n, FILE *stream)
{
- ssize_t i;
- int ch;
-
- ch = getc(stream);
+ int ch = getc(stream);
if (ferror(stream) || feof(stream))
return -1;
if (ferror(stream) || feof(stream))
return -1;
@@
-48,15
+45,20
@@
ssize_t xbt_getline(char **buf, size_t *n, FILE *stream)
*buf = xbt_malloc(*n);
}
*buf = xbt_malloc(*n);
}
- i = 0;
+
ssize_t
i = 0;
do {
do {
- if (i == *n)
- *buf = xbt_realloc(*buf, *n += 512);
- (*buf)[i++] = ch;
+ if (i == *n) {
+ *n += 512;
+ *buf = xbt_realloc(*buf, *n);
+ }
+ (*buf)[i] = ch;
+ i++;
} while (ch != '\n' && (ch = getc(stream)) != EOF);
} while (ch != '\n' && (ch = getc(stream)) != EOF);
- if (i == *n)
- *buf = xbt_realloc(*buf, *n += 1);
+ if (i == *n) {
+ *n += 1;
+ *buf = xbt_realloc(*buf, *n);
+ }
(*buf)[i] = '\0';
return i;
(*buf)[i] = '\0';
return i;