Commit 5c186dff authored by Hallvard Furuseth's avatar Hallvard Furuseth
Browse files

Silence valgrind's ptrcheck (no real change).

Also removes a bit unnecessary code.
parent a5d1029f
...@@ -790,13 +790,10 @@ ldif_read_record( ...@@ -790,13 +790,10 @@ ldif_read_record(
char **bufp, /* ptr to malloced output buffer */ char **bufp, /* ptr to malloced output buffer */
int *buflenp ) /* ptr to length of *bufp */ int *buflenp ) /* ptr to length of *bufp */
{ {
char linebuf[LDIF_MAXLINE], *line, *nbufp; char line[LDIF_MAXLINE], *nbufp;
ber_len_t lcur = 0, len, linesize; ber_len_t lcur = 0, len;
int last_ch = '\n', found_entry = 0, stop, top_comment = 0; int last_ch = '\n', found_entry = 0, stop, top_comment = 0;
line = linebuf;
linesize = sizeof( linebuf );
for ( stop = 0; !stop; last_ch = line[len-1] ) { for ( stop = 0; !stop; last_ch = line[len-1] ) {
/* If we're at the end of this file, see if we should pop /* If we're at the end of this file, see if we should pop
* back to a previous file. (return from an include) * back to a previous file. (return from an include)
...@@ -815,10 +812,11 @@ ldif_read_record( ...@@ -815,10 +812,11 @@ ldif_read_record(
if ( stop ) if ( stop )
break; break;
if ( fgets( line, linesize, lfp->fp ) == NULL ) { if ( fgets( line, sizeof( line ), lfp->fp ) == NULL ) {
stop = 1; stop = 1;
/* Add \n in case the file does not end with newline */ /* Add \n in case the file does not end with newline */
line = "\n"; line[0] = '\n';
line[1] = '\0';
} }
len = strlen( line ); len = strlen( line );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment