From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 19:20:31 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02DD616A403; Fri, 21 Apr 2006 19:20:31 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BDAD316A401
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 19:20:30 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8969143D4C
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 19:20:30 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3LJKTxw025542
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 19:20:30 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LJKTXH025530
	for perforce@freebsd.org; Fri, 21 Apr 2006 19:20:29 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 21 Apr 2006 19:20:29 GMT
Message-Id: <200604211920.k3LJKTXH025530@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95818 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Apr 2006 19:20:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=95818

Change 95818 by millert@millert_g5tower on 2006/04/21 19:19:35

	Improve readability

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/getline.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/getline.c#2 (text+ko) ====

@@ -37,24 +37,25 @@
  * Note that outsize is not changed unless memory is allocated.
  */
 ssize_t
-getline(char **outbuf, size_t *outsize, FILE *fp)
+getline(char **bufp, size_t *bufsizep, FILE *fp)
 {
-	char *buf;
-	size_t len;
+	char *line, *buf = *bufp;
+	size_t linelen, bufsize = *bufsizep;
 
-	buf = fgetln(fp, &len);
-	if (buf == NULL)
+	line = fgetln(fp, &linelen);
+	if (line == NULL)
 		return (-1);
 
 	/* Assumes realloc() accepts NULL for ptr (C99) */
-	if (*outbuf == NULL || *outsize < len + 1) {
-		void *tmp = realloc(*outbuf, len + 1);
-		if (tmp == NULL)
+	if (buf == NULL || bufsize < linelen + 1) {
+		bufsize = linelen + 1;
+		buf = realloc(buf, bufsize);
+		if (buf == NULL)
 			return (-1);
-		*outbuf = tmp;
-		*outsize = len + 1;
+		*bufp = buf;
+		*bufsizep = bufsize;
 	}
-	memcpy(*outbuf, buf, len);
-	(*outbuf)[len] = '\0';
-	return (len);
+	memcpy(buf, line, linelen);
+	buf[linelen] = '\0';
+	return (linelen);
 }