diff options
author | markm <markm@FreeBSD.org> | 2000-02-24 11:28:20 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-02-24 11:28:20 +0000 |
commit | 5ed96cd5daa48af752db4781418f32f9258cce94 (patch) | |
tree | cbf6e4300b6d10326e92349d0f71b9054f47c4f2 /crypto/heimdal/lib/roken | |
parent | 69414e22b995b6d161fc19bcab66823585f1d394 (diff) | |
download | FreeBSD-src-5ed96cd5daa48af752db4781418f32f9258cce94.zip FreeBSD-src-5ed96cd5daa48af752db4781418f32f9258cce94.tar.gz |
Vendor import of Heimdal 0.2p
Diffstat (limited to 'crypto/heimdal/lib/roken')
-rw-r--r-- | crypto/heimdal/lib/roken/ChangeLog | 13 | ||||
-rw-r--r-- | crypto/heimdal/lib/roken/Makefile.am | 4 | ||||
-rw-r--r-- | crypto/heimdal/lib/roken/Makefile.in | 4 | ||||
-rw-r--r-- | crypto/heimdal/lib/roken/snprintf.c | 6 |
4 files changed, 20 insertions, 7 deletions
diff --git a/crypto/heimdal/lib/roken/ChangeLog b/crypto/heimdal/lib/roken/ChangeLog index b157494..6da4be0 100644 --- a/crypto/heimdal/lib/roken/ChangeLog +++ b/crypto/heimdal/lib/roken/ChangeLog @@ -1,3 +1,16 @@ +2000-02-19 Assar Westerlund <assar@sics.se> + + * Makefile.am: set version to 7:1:2 + +2000-02-16 Assar Westerlund <assar@sics.se> + + * snprintf.c (PARSE_INT_FORMAT): note that shorts are actually + transmitted as ints + (according to the integer protomotion rules) in variable arguments + lists. Therefore, we should not call va_arg with short but rather + with int. See <http://www.debian.org/Bugs/db/57/57919.html> for + original bug report + 2000-02-13 Assar Westerlund <assar@sics.se> * Makefile.am: bump version to 7:0:2 diff --git a/crypto/heimdal/lib/roken/Makefile.am b/crypto/heimdal/lib/roken/Makefile.am index d23fcb3..3d303f8 100644 --- a/crypto/heimdal/lib/roken/Makefile.am +++ b/crypto/heimdal/lib/roken/Makefile.am @@ -1,11 +1,11 @@ -# $Id: Makefile.am,v 1.69 2000/02/13 20:34:03 assar Exp $ +# $Id: Makefile.am,v 1.70 2000/02/19 18:53:13 assar Exp $ include $(top_srcdir)/Makefile.am.common CLEANFILES = roken.h make-roken.c print_version.h lib_LTLIBRARIES = libroken.la -libroken_la_LDFLAGS = -version-info 7:0:2 +libroken_la_LDFLAGS = -version-info 7:1:2 noinst_PROGRAMS = make-roken make-print-version diff --git a/crypto/heimdal/lib/roken/Makefile.in b/crypto/heimdal/lib/roken/Makefile.in index 65c3f99..6db3973 100644 --- a/crypto/heimdal/lib/roken/Makefile.in +++ b/crypto/heimdal/lib/roken/Makefile.in @@ -10,7 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# $Id: Makefile.am,v 1.69 2000/02/13 20:34:03 assar Exp $ +# $Id: Makefile.am,v 1.70 2000/02/19 18:53:13 assar Exp $ # $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $ @@ -176,7 +176,7 @@ CHECK_LOCAL = $(PROGRAMS) CLEANFILES = roken.h make-roken.c print_version.h lib_LTLIBRARIES = libroken.la -libroken_la_LDFLAGS = -version-info 7:0:2 +libroken_la_LDFLAGS = -version-info 7:1:2 noinst_PROGRAMS = make-roken make-print-version diff --git a/crypto/heimdal/lib/roken/snprintf.c b/crypto/heimdal/lib/roken/snprintf.c index 0333e87..4f69e66 100644 --- a/crypto/heimdal/lib/roken/snprintf.c +++ b/crypto/heimdal/lib/roken/snprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1997, 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1995-2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: snprintf.c,v 1.24 1999/12/02 16:58:52 joda Exp $"); +RCSID("$Id: snprintf.c,v 1.25 2000/02/16 01:38:52 assar Exp $"); #endif #include <stdio.h> #include <stdarg.h> @@ -265,7 +265,7 @@ append_char(struct state *state, if (long_flag) \ res = (unsig long)va_arg(arg, unsig long); \ else if (short_flag) \ - res = (unsig short)va_arg(arg, unsig short); \ + res = (unsig short)va_arg(arg, unsig int); \ else \ res = (unsig int)va_arg(arg, unsig int) |