projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error.c, md5.c, regex.c: Use '#if USE_UNLOCKED_IO' instead of
[gnulib.git]
/
lib
/
linebuffer.c
diff --git
a/lib/linebuffer.c
b/lib/linebuffer.c
index
bed5d94
..
c12cdbd
100644
(file)
--- a/
lib/linebuffer.c
+++ b/
lib/linebuffer.c
@@
-1,7
+1,7
@@
/* linebuffer.c -- read arbitrarily long lines
/* linebuffer.c -- read arbitrarily long lines
- Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003
, 2004 Fre
e
+
Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,19
+25,21
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include "linebuffer.h"
#include <sys/types.h>
#include "linebuffer.h"
-#include "unlocked-io.h"
#include "xalloc.h"
#include "xalloc.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
/* Initialize linebuffer LINEBUFFER for use. */
void
initbuffer (struct linebuffer *linebuffer)
{
/* Initialize linebuffer LINEBUFFER for use. */
void
initbuffer (struct linebuffer *linebuffer)
{
- linebuffer->length = 0;
- linebuffer->size = 200;
- linebuffer->buffer = xmalloc (linebuffer->size);
+ memset (linebuffer, 0, sizeof *linebuffer);
}
/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
}
/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
@@
-73,9
+75,9
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
}
if (p == end)
{
}
if (p == end)
{
-
linebuffer->size *= 2
;
- buffer = x
realloc (buffer,
linebuffer->size);
- p =
p - linebuffer->buffer + buffer
;
+
size_t oldsize = linebuffer->size
;
+ buffer = x
2realloc (buffer, &
linebuffer->size);
+ p =
buffer + oldsize
;
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;
}
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;
}