diff options
author | Jim Jagielski <jim@apache.org> | 2008-05-02 17:25:50 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2008-05-02 17:25:50 +0000 |
commit | 6ddb8b00c545236c0e764c942afd369363933b40 (patch) | |
tree | ad4c5035f06531ff0eb27edadfe95f5b29679c93 | |
parent | 22234708dd413de3f26fda7239f376cae49df7af (diff) | |
download | apr-6ddb8b00c545236c0e764c942afd369363933b40.tar.gz |
Document cvt from V7, not GNU libc, and copyright
Caldera International Inc.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@652832 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | LICENSE | 44 | ||||
-rw-r--r-- | NOTICE | 3 | ||||
-rw-r--r-- | strings/apr_snprintf.c | 4 |
3 files changed, 49 insertions, 2 deletions
@@ -295,3 +295,47 @@ From strings/apr_strnatcmp.c, include/apr_strings.h: misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. +From strings/apr_snprintf.c: + + * + * cvt - IEEE floating point formatting routines. + * Derived from UNIX V7, Copyright(C) Caldera International Inc. + * + + Copyright(C) Caldera International Inc. 2001-2002. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + Redistributions of source code and documentation must retain the above + copyright notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + All advertising materials mentioning features or use of this software + must display the following acknowledgement: + + This product includes software developed or owned by Caldera + International, Inc. + + Neither the name of Caldera International, Inc. nor the names of other + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA + INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT, + INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + @@ -7,3 +7,6 @@ Illinois at Urbana-Champaign. This software contains code derived from the RSA Data Security Inc. MD5 Message-Digest Algorithm. + +This software contains code derived from UNIX V7, Copyright(C) +Caldera International Inc. diff --git a/strings/apr_snprintf.c b/strings/apr_snprintf.c index bb6ef528a..bf3f58537 100644 --- a/strings/apr_snprintf.c +++ b/strings/apr_snprintf.c @@ -68,8 +68,8 @@ typedef enum { #define NUM_BUF_SIZE 512 /* - * cvt.c - IEEE floating point formatting routines for FreeBSD - * from GNU libc-4.6.27. Modified to be thread safe. + * cvt - IEEE floating point formatting routines. + * Derived from UNIX V7, Copyright(C) Caldera International Inc. */ /* |