diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2017-12-28 17:22:45 -0500 |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2018-01-15 11:27:34 -0500 |
commit | f5b23ab1bf72ac2cdaae0b2c394daf035e95d934 (patch) | |
tree | 560b7ed0f15fa36a28052376045b0e6bbe06bd4c /port | |
parent | 1dcf5303e138dd6d717058de0958efc42a05b8e4 (diff) | |
download | libtiff-git-f5b23ab1bf72ac2cdaae0b2c394daf035e95d934.tar.gz |
cmake: remove unused configure checks
Diffstat (limited to 'port')
-rw-r--r-- | port/CMakeLists.txt | 6 | ||||
-rw-r--r-- | port/strtoull.c | 116 |
2 files changed, 1 insertions, 121 deletions
diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt index 8b221d1d..439fb3d7 100644 --- a/port/CMakeLists.txt +++ b/port/CMakeLists.txt @@ -28,8 +28,7 @@ set(port_optional_SOURCES getopt.c lfind.c strcasecmp.c - strtoul.c - strtoull.c) + strtoul.c) set(port_USED_FILES ${port_SOURCES} ${port_HEADERS}) @@ -48,9 +47,6 @@ endif() if(NOT HAVE_STRTOUL) list(APPEND port_USED_FILES strtoul.c) endif() -if(NOT HAVE_STRTOULL) - list(APPEND port_USED_FILES strtoull.c) -endif() add_library(port STATIC ${port_USED_FILES}) diff --git a/port/strtoull.c b/port/strtoull.c deleted file mode 100644 index fb7739cc..00000000 --- a/port/strtoull.c +++ /dev/null @@ -1,116 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 THE REGENTS 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 THE REGENTS OR 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. - */ - -#include <limits.h> -#include <errno.h> -#include <ctype.h> -#include <stdlib.h> - -/* - * Convert a string to an unsigned long long integer. - * - * Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -unsigned long long -strtoull(const char *nptr, char **endptr, int base) -{ - const char *s; - unsigned long long acc; - char c; - unsigned long long cutoff; - int neg, any, cutlim; - - /* - * See strtoq for comments as to the logic used. - */ - s = nptr; - do { - c = *s++; - } while (isspace((unsigned char)c)); - if (c == '-') { - neg = 1; - c = *s++; - } else { - neg = 0; - if (c == '+') - c = *s++; - } - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X') && - ((s[1] >= '0' && s[1] <= '9') || - (s[1] >= 'A' && s[1] <= 'F') || - (s[1] >= 'a' && s[1] <= 'f'))) { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - acc = any = 0; - if (base < 2 || base > 36) - goto noconv; - - cutoff = ULLONG_MAX / base; - cutlim = ULLONG_MAX % base; - for ( ; ; c = *s++) { - if (c >= '0' && c <= '9') - c -= '0'; - else if (c >= 'A' && c <= 'Z') - c -= 'A' - 10; - else if (c >= 'a' && c <= 'z') - c -= 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) { - acc = ULLONG_MAX; - errno = ERANGE; - } else if (!any) { -noconv: - errno = EINVAL; - } else if (neg) - acc = -acc; - if (endptr != NULL) - *endptr = (char *)(any ? s - 1 : nptr); - return (acc); -} |