projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
c734a0b
..
d5bc916
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-224,7
+224,7
@@
static char *readline(FILE * fp, char *buf, size_t buflen) {
newline = strchr(p, '\n');
if(!newline)
newline = strchr(p, '\n');
if(!newline)
- return
NULL
;
+ return
buf
;
*newline = '\0'; /* kill newline */
if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */
*newline = '\0'; /* kill newline */
if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */
@@
-238,7
+238,6
@@
static char *readline(FILE * fp, char *buf, size_t buflen) {
starting at *base.
*/
int read_config_file(splay_tree_t *config_tree, const char *fname) {
starting at *base.
*/
int read_config_file(splay_tree_t *config_tree, const char *fname) {
- int err = -2; /* Parse error */
FILE *fp;
char buffer[MAX_STRING_SIZE];
char *line;
FILE *fp;
char buffer[MAX_STRING_SIZE];
char *line;