CVS commit: src/crypto/external/bsd/libsaslc/dist/man

[Mateusz Kocielski]

Module Name:src
Committed By:   shm
Date:   Mon Jul 13 13:57:45 UTC 2015

Modified Files:
src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3

Log Message:
PR#49876 - fix typos, from Dieter Roelants.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3
diff -u src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.15 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.16
--- src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.15	Tue May 14 15:33:21 2013
+++ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3	Mon Jul 13 13:57:44 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: libsaslc.3,v 1.15 2013/05/14 15:33:21 elric Exp $
+.\"	$NetBSD: libsaslc.3,v 1.16 2015/07/13 13:57:44 shm Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 23, 2011
+.Dd May 3, 2015
 .Dt LIBSASLC 3
 .Os
 .Sh NAME
@@ -240,7 +240,7 @@ and
 functions are used to provide the integrity
 .Pq Qq auth-int
 and  confidentiality
-.Pq Qq auth-int
+.Pq Qq auth-conf
 layers for mechanisms that provide them.
 They encode and, respectively, decode
 .Ar inlen
@@ -322,7 +322,7 @@ files, while the session dictionary is l
 .Pp
 The configuration file
 .Pa //saslc.conf
-is used for the configuration context.
+is used for the context configuration.
 The
 .Pa //mech/.conf
 file is used for the mechanism configuration.

CVS commit: src/lib/libc/time

[Brian Ginsbach]

Module Name:src
Committed By:   ginsbach
Date:   Mon Jul 13 17:45:16 UTC 2015

Modified Files:
src/lib/libc/time: strptime.c

Log Message:
Switch to using isleap() and isleap_sum() macros from  to be
consistent with strftime.c and localtime.c.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/time/strptime.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.42 src/lib/libc/time/strptime.c:1.43
--- src/lib/libc/time/strptime.c:1.42	Wed Jul  8 19:48:20 2015
+++ src/lib/libc/time/strptime.c	Mon Jul 13 17:45:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: strptime.c,v 1.42 2015/07/08 19:48:20 ginsbach Exp $	*/
+/*	$NetBSD: strptime.c,v 1.43 2015/07/13 17:45:16 ginsbach Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,13 +31,12 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.42 2015/07/08 19:48:20 ginsbach Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.43 2015/07/13 17:45:16 ginsbach Exp $");
 #endif
 
 #include "namespace.h"
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -104,7 +103,7 @@ static int
 first_wday_of(int yr)
 {
 	return ((2 * (3 - (yr / 100) % 4)) + (yr % 100) + ((yr % 100) /  4) +
-	(is_leap_year(yr) ? 6 : 0) + 1) % 7;
+	(isleap(yr) ? 6 : 0) + 1) % 7;
 }
 
 char *
@@ -587,7 +586,7 @@ literal:
 
 	if (!HAVE_YDAY(state) && HAVE_YEAR(state)) {
 		if (HAVE_MON(state) && HAVE_MDAY(state)) {
-			tm->tm_yday =  start_of_month[is_leap_year(tm->tm_year +
+			tm->tm_yday =  start_of_month[isleap_sum(tm->tm_year,
 			TM_YEAR_BASE)][tm->tm_mon] + (tm->tm_mday - 1);
 			state |= S_YDAY;
 		} else if (day_offset != -1) {
@@ -610,7 +609,7 @@ literal:
 		int isleap;
 		if (!HAVE_MON(state)) {
 			i = 0;
-			isleap = is_leap_year(tm->tm_year + TM_YEAR_BASE);
+			isleap = isleap_sum(tm->tm_year, TM_YEAR_BASE);
 			while (tm->tm_yday >= start_of_month[isleap][i])
 i++;
 			if (i > 12) {
@@ -622,7 +621,7 @@ literal:
 			state |= S_MON;
 		}
 		if (!HAVE_MDAY(state)) {
-			isleap = is_leap_year(tm->tm_year + TM_YEAR_BASE);
+			isleap = isleap_sum(tm->tm_year, TM_YEAR_BASE);
 			tm->tm_mday = tm->tm_yday -
 			start_of_month[isleap][tm->tm_mon] + 1;
 			state |= S_MDAY;