From d1d7d88a5d0009a9a01f623f887bef2bdc3728d3 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 17 Mar 2018 12:39:00 +0100 Subject: [PATCH] Adjust prototypes of xmalloc(), xrealloc() and xstrdup() SylixOS defines its own versions of these functions in its standard library, which collide with ours. However, their prototypes make more sense, because they follow the prototypes of the non-x versions in the C standard, so there is no harm in following them. --- common.c | 12 ++++++------ pciutils.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common.c b/common.c index 8ea52fa..9cd72be 100644 --- a/common.c +++ b/common.c @@ -1,7 +1,7 @@ /* * The PCI Utilities -- Common Functions * - * Copyright (c) 1997--2008 Martin Mares + * Copyright (c) 1997--2016 Martin Mares * * 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); diff --git a/pciutils.h b/pciutils.h index e433e6b..1de2b01 100644 --- a/pciutils.h +++ b/pciutils.h @@ -1,7 +1,7 @@ /* * The PCI Utilities -- Declarations * - * Copyright (c) 1997--2008 Martin Mares + * Copyright (c) 1997--2016 Martin Mares * * 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 -- 2.39.5