From eee1fedc3a69e503fab74248937e35e71dee4992 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Thu, 22 Dec 2016 16:31:28 +0100 Subject: util: remove unused functions Removed: xstrmalloc, xmalloc, xrealloc, xstrcut, szadd, szmul. --- util.c | 85 +++--------------------------------------------------------------- 1 file changed, 3 insertions(+), 82 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index a8c3729..9f8e23e 100644 --- a/util.c +++ b/util.c @@ -15,23 +15,6 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Some contents of this file (indicated below) are based on work covered by - * the following copyright and permission notice: - * - * Copyright (c) 2008 Otto Moerbeek - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include #include @@ -42,80 +25,18 @@ #include #include "log.h" +#include "eprintf.h" #include "util.h" -/* szadd: checked size_t addition */ -size_t szadd(size_t a, size_t b) -{ - if (SIZE_MAX - a < b) - error(0, EMSG_SZOP); - - return a + b; -} - -/* szmul: checked size_t multiplication - * License information can be found at the top of this file */ -size_t szmul(size_t a, size_t b) -{ -#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof (size_t) * 4)) - if ((a >= MUL_NO_OVERFLOW || b >= MUL_NO_OVERFLOW) && - a > 0 && SIZE_MAX / a < b) - error(0, EMSG_SZOP); -#undef MUL_NO_OVERFLOW - - return a * b; -} - /* xstrmalloc: allocate for a string (+1) or exit with error */ void *xstrmalloc(size_t size) { size_t nsize; - nsize = size + 1; - if (nsize < size) + if (size == SIZE_MAX) error(0, EMSG_ALLOC); - return xmalloc(nsize); -} - -/* xstrdup: duplicae string or exit with error */ -char *xstrdup(const char *s) -{ - char *ret; - - assert(s); - - ret = xstrmalloc(strlen(s)); - strcpy(ret, s); - - return ret; -} - -/* xrealloc: reallocate or exit with error */ -void *xrealloc(void *p, size_t size) -{ - p = realloc(p, size); - if (!p) - error(errno, EMSG_ALLOC); - - return p; -} - -/* xmalloc: allocate or exit with error */ -void *xmalloc(size_t size) -{ - return xrealloc(NULL, size); -} - -/* xstrcut: cut out a bit of a string into a new string */ -char *xstrcut(const char *s, size_t offt, size_t len) -{ - char *ret; - - ret = xstrmalloc(len); - strncpy(ret, s + offt, len + 1); - - return ret; + return emalloc(nsize); } /* xstrcasecmp: case insensitive strcmp */ -- cgit v1.2.3-54-g00ecf From cb4a70a049f2df4b6ffaa5f7fb5f920910bd1d68 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Thu, 22 Dec 2016 18:38:59 +0100 Subject: log: removal of log.{c,h} --- Makefile | 2 +- hktool.c | 4 +-- log.c | 99 ---------------------------------------------------------------- log.h | 42 --------------------------- util.c | 3 +- 5 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 log.c delete mode 100644 log.h (limited to 'util.c') diff --git a/Makefile b/Makefile index 3c203df..40acd65 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CFLAGS = -std=c11 -O2 -flto $(WARNINGS) -MMD -MP $(shell $(PKG_CONFIG) --cflags LDFLAGS = -Wl,--as-needed -O2 -flto LDLIBS = $(shell $(PKG_CONFIG) --libs $(LIBS)) -OBJ := hktool.o halfkay.o log.o params.o util.o eprintf.o +OBJ := hktool.o halfkay.o params.o util.o eprintf.o PREFIX ?= /usr/local diff --git a/hktool.c b/hktool.c index e95b556..76e6b75 100644 --- a/hktool.c +++ b/hktool.c @@ -24,7 +24,6 @@ #include #include "halfkay.h" -#include "log.h" #include "eprintf.h" #include "params.h" @@ -67,8 +66,7 @@ int main(int argc, char **argv) int opt; struct flashparams fp; - argv0 = argv[0] != NULL ? argv[0] : "hktool"; - setprogname(argv0); + setprogname(argv[0] != NULL ? argv[0] : "hktool"); while (opt = getopt(argc, argv, "f:h-lvr"), opt != -1) { switch (opt) { diff --git a/log.c b/log.c deleted file mode 100644 index 39730bf..0000000 --- a/log.c +++ /dev/null @@ -1,99 +0,0 @@ -/* log.c -- Error and warning messages. - * - * Copyright (C) 2016 Tomasz Kramkowski - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include -#include -#include -#include -#include - -#include "log.h" - -const char *argv0; - -void error(int errnum, const char *fmt, ...) -{ - assert(fmt); - - va_list va; - - fprintf(stderr, "%s: error: ", argv0); - - va_start(va, fmt); - vfprintf(stderr, fmt, va); - va_end(va); - - if (errnum) - fprintf(stderr, ": %s", strerror(errnum)); - - fputc('\n', stderr); - - exit(EXIT_FAILURE); -} - -void errorat(int errnum, const char *file, long line, const char *fmt, ...) -{ - assert(file && fmt); - - va_list va; - - fprintf(stderr, "%s:%s:%ld: error: ", argv0, file, line); - - va_start(va, fmt); - vfprintf(stderr, fmt, va); - va_end(va); - - if (errnum) - fprintf(stderr, ": %s", strerror(errnum)); - - fputc('\n', stderr); - - exit(EXIT_FAILURE); -} - -void warning(int errnum, const char *fmt, ...) -{ - va_list ap; - - fprintf(stderr, "%s: warning: ", argv0); - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - if (errnum) - fprintf(stderr, ": %s", strerror(errnum)); - - fputc('\n', stderr); -} - -void warningat(int errnum, const char *file, long line, const char *fmt, ...) -{ - va_list ap; - - fprintf(stderr, "%s:%s:%ld: warning: ", argv0, file, line); - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - if (errnum) - fprintf(stderr, ": %s", strerror(errnum)); - - fputc('\n', stderr); -} diff --git a/log.h b/log.h deleted file mode 100644 index d6ae299..0000000 --- a/log.h +++ /dev/null @@ -1,42 +0,0 @@ -/* log.h -- Error and warning messages. - * - * Copyright (C) 2016 Tomasz Kramkowski - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef LOG_H -#define LOG_H - -#include - -#define EMSG_ALLOC "Could not allocate memory" -#define EMSG_OPEN "Could not open '%s'" -#define EMSG_READ "Could not read '%s'" -#define EMSG_SZOP "Arithmetic operation on size_t would wrap" -#define EMSG_GNOMEM "A call to glob ran out of memory" - -extern const char *argv0; - -noreturn void error(int errnum, const char *fmt, ...) - __attribute__ ((format(printf, 2, 3))); -noreturn void errorat(int errnum, const char *file, long line, const char *fmt, ...) - __attribute__ ((format(printf, 4, 5))); - -void warning(int errnum, const char *fmt, ...) - __attribute__ ((format(printf, 2, 3))); -void warningat(int errnum, const char *file, long line, const char *fmt, ...) - __attribute__ ((format(printf, 4, 5))); - -#endif /* LOG_H */ diff --git a/util.c b/util.c index 9f8e23e..33c5bee 100644 --- a/util.c +++ b/util.c @@ -24,7 +24,6 @@ #include #include -#include "log.h" #include "eprintf.h" #include "util.h" @@ -34,7 +33,7 @@ void *xstrmalloc(size_t size) size_t nsize; if (size == SIZE_MAX) - error(0, EMSG_ALLOC); + eprintf("xstrmalloc(%zu) failed: %zu == SIZE_MAX", size, size); return emalloc(nsize); } -- cgit v1.2.3-54-g00ecf