Date: Mon, 7 Aug 2006 22:46:53 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 103407 for review Message-ID: <200608072246.k77MkrCj077927@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103407 Change 103407 by jb@jb_freebsd2 on 2006/08/07 22:46:36 IFC Affected files ... .. //depot/projects/dtrace/src/lib/libc/gen/syslog.c#4 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#4 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libc/gen/syslog.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.37 2006/05/11 09:10:33 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.38 2006/08/07 20:12:18 phk Exp $"); #include "namespace.h" #include <sys/types.h> @@ -116,7 +116,7 @@ h->base += len; h->left -= len; } - return 0; + return len; } /* ==== //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.12 2006/06/06 22:06:24 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.13 2006/08/07 20:09:09 pjd Exp $"); #include <stdio.h> #include <stdint.h> @@ -393,7 +393,7 @@ } } /* - * If md_iterations is equal to 0, user don't want PKCS5v2. + * If md_iterations is equal to 0, user don't want PKCS#5v2. */ if (md->md_iterations == 0) { g_eli_crypto_hmac_update(&ctx, md->md_salt,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608072246.k77MkrCj077927>