From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 6 Dec 2010 08:19:40 +0000 (+0000)
Subject: Silence valgrind's ptrcheck (no real change).
X-Git-Tag: MIGRATION_CVS2GIT~380
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c186dff4d2c9d0a88d01f68209eb9c2d18e99ee;p=openldap

Silence valgrind's ptrcheck (no real change).
Also removes a bit unnecessary code.
---

diff --git a/libraries/liblutil/ldif.c b/libraries/liblutil/ldif.c
index b953af0f1c..6994a060ca 100644
--- a/libraries/liblutil/ldif.c
+++ b/libraries/liblutil/ldif.c
@@ -790,13 +790,10 @@ ldif_read_record(
 	char        **bufp,     /* ptr to malloced output buffer           */
 	int         *buflenp )  /* ptr to length of *bufp                  */
 {
-	char        linebuf[LDIF_MAXLINE], *line, *nbufp;
-	ber_len_t   lcur = 0, len, linesize;
+	char        line[LDIF_MAXLINE], *nbufp;
+	ber_len_t   lcur = 0, len;
 	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] ) {
 		/* If we're at the end of this file, see if we should pop
 		 * back to a previous file. (return from an include)
@@ -815,10 +812,11 @@ ldif_read_record(
 		if ( stop )
 			break;
 
-		if ( fgets( line, linesize, lfp->fp ) == NULL ) {
+		if ( fgets( line, sizeof( line ), lfp->fp ) == NULL ) {
 			stop = 1;
 			/* Add \n in case the file does not end with newline */
-			line = "\n";
+			line[0] = '\n';
+			line[1] = '\0';
 		}
 		len = strlen( line );