From 5681fe8eaea08a9c95b48291bb94a21ab0f7e24a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 13 Sep 2014 09:24:28 -0700 Subject: [PATCH] Remove an unused file. Also remove a reference to it and two other files that have already been removed in a script --- these files were problematic because they weren't UTF-8. Change-Id: Ibf597bac1903c34d8d0fe0a09615c42f24d4f23d --- libc/bionic/hash.h | 68 ----------------------------------- libc/tools/generate-NOTICE.py | 1 - 2 files changed, 69 deletions(-) delete mode 100644 libc/bionic/hash.h diff --git a/libc/bionic/hash.h b/libc/bionic/hash.h deleted file mode 100644 index 3b483f1a1..000000000 --- a/libc/bionic/hash.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 1999 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. 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. - * - * 3. Neither the name of KTH nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY KTH AND ITS 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 KTH OR ITS CONTRIBUTORS 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. */ - -/* $Heimdal: hash.h,v 1.1 1999/03/22 19:16:25 joda Exp $ - $NetBSD: hash.h,v 1.1.1.3 2002/09/12 12:41:42 joda Exp $ */ - -/* stuff in common between md4, md5, and sha1 */ - -#ifndef __hash_h__ -#define __hash_h__ - -#include -#include - -#ifndef min -#define min(a,b) (((a)>(b))?(b):(a)) -#endif - -/* Vector Crays doesn't have a good 32-bit type, or more precisely, - int32_t as defined by isn't 32 bits, and we don't - want to depend in being able to redefine this type. To cope with - this we have to clamp the result in some places to [0,2^32); no - need to do this on other machines. Did I say this was a mess? - */ - -#ifdef _CRAY -#define CRAYFIX(X) ((X) & 0xffffffff) -#else -#define CRAYFIX(X) (X) -#endif - -static inline u_int32_t -cshift (u_int32_t x, unsigned int n) -{ - x = CRAYFIX(x); - return CRAYFIX((x << n) | (x >> (32 - n))); -} - -#endif /* __hash_h__ */ diff --git a/libc/tools/generate-NOTICE.py b/libc/tools/generate-NOTICE.py index 8cd75a3b7..3edc29963 100755 --- a/libc/tools/generate-NOTICE.py +++ b/libc/tools/generate-NOTICE.py @@ -121,7 +121,6 @@ for arg in args: try: content = open(path, 'r').read().decode('utf-8') except: - # TODO: update hash.h, md5.c, and md5.h; upstream is probably UTF-8 already. sys.stderr.write('warning: bad UTF-8 in %s\n' % path) content = open(path, 'r').read().decode('iso-8859-1')