diff options
| -rw-r--r-- | common.c | 12 | ||||
| -rw-r--r-- | pciutils.h | 8 |
2 files changed, 10 insertions, 10 deletions
@@ -1,7 +1,7 @@ /* * The PCI Utilities -- Common Functions * - * Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz> + * Copyright (c) 1997--2016 Martin Mares <mj@ucw.cz> * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -27,25 +27,25 @@ die(char *msg, ...) } void * -xmalloc(unsigned int howmuch) +xmalloc(size_t howmuch) { void *p = malloc(howmuch); if (!p) - die("Unable to allocate %d bytes of memory", howmuch); + die("Unable to allocate %d bytes of memory", (int) howmuch); return p; } void * -xrealloc(void *ptr, unsigned int howmuch) +xrealloc(void *ptr, size_t howmuch) { void *p = realloc(ptr, howmuch); if (!p) - die("Unable to allocate %d bytes of memory", howmuch); + die("Unable to allocate %d bytes of memory", (int) howmuch); return p; } char * -xstrdup(char *str) +xstrdup(const char *str) { int len = strlen(str) + 1; char *copy = xmalloc(len); @@ -1,7 +1,7 @@ /* * The PCI Utilities -- Declarations * - * Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz> + * Copyright (c) 1997--2016 Martin Mares <mj@ucw.cz> * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -20,9 +20,9 @@ extern const char program_name[]; void die(char *msg, ...) NONRET PCI_PRINTF(1,2); -void *xmalloc(unsigned int howmuch); -void *xrealloc(void *ptr, unsigned int howmuch); -char *xstrdup(char *str); +void *xmalloc(size_t howmuch); +void *xrealloc(void *ptr, size_t howmuch); +char *xstrdup(const char *str); int parse_generic_option(int i, struct pci_access *pacc, char *optarg); #ifdef PCI_HAVE_PM_INTEL_CONF |