projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use buffer instead of line in read_config_file(), line may be assigned
[oweals/tinc.git]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index a3c5f693f8052f7b1712ff0c7bccedf62c8154cb..833b1eb230cfe20c5136c6df9b6e8ecc23a0f114 100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,7
+19,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.3
0 2000/12/01 12:36:36
zarq Exp $
+ $Id: conf.c,v 1.9.4.3
1 2000/12/01 12:38:42
zarq Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-218,7
+218,7
@@
int read_config_file(config_t **base, const char *fname)
{
int err = -1;
FILE *fp;
{
int err = -1;
FILE *fp;
- char *line;
+ char *
buffer, *
line;
char *p, *q;
int i, lineno = 0;
config_t *cfg;
char *p, *q;
int i, lineno = 0;
config_t *cfg;
@@
-229,11
+229,11
@@
cp
return -1;
bufsize = 100;
return -1;
bufsize = 100;
-
line
= xmalloc(bufsize);
+
buffer
= xmalloc(bufsize);
for(;;)
{
for(;;)
{
- if((line = readline(fp,
line
, &bufsize)) == NULL)
+ if((line = readline(fp,
buffer
, &bufsize)) == NULL)
{
err = -1;
break;
{
err = -1;
break;
@@
-284,7
+284,7
@@
cp
config = cfg;
}
config = cfg;
}
- free(
line
);
+ free(
buffer
);
fclose (fp);
cp
return err;
fclose (fp);
cp
return err;