ccb6ae8de1
The includes used to define a lot of things a library include should not. It was also a bit messy what was exposed in the library and what was not. get_pid_digits -> procps_pid_length and exported correctly MALLOC attribute move into relevant .c files NORETURN attribute moved to relevant .c, not used in library PURE attribute removed, it wasn't used KLONG/KLF/STRTOUKL were fixed for long, so now just use long HIDDEN attribute removed. It was for 3 functions. The PROCPS_EXPORT seems to do the same (opposite) thing. likely/unlikely removed from most places, its highly debateable this does anything useful as CPUs have gotten smarter about branches. Re-arranged the includes, ALL external programs should just #include <proc/procps.h> then proc/procps.h includes headers for files that have exported functions. procps.h and the headers it includes should not use items that are not exportable (e.g. hidden functions or macros) they go in procps-private.h
97 lines
2.6 KiB
C
97 lines
2.6 KiB
C
/*
|
|
* alloc.c - memory allocation functions
|
|
* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com
|
|
* Copyright 2002 Albert Cahalan
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "alloc.h"
|
|
|
|
typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2)));
|
|
/* change xalloc_err_handler to override the default fprintf(stderr... */
|
|
extern message_fn xalloc_err_handler;
|
|
|
|
static void xdefault_error(const char *restrict fmts, ...) __attribute__((format(printf,1,2)));
|
|
static void xdefault_error(const char *restrict fmts, ...) {
|
|
va_list va;
|
|
|
|
va_start(va, fmts);
|
|
fprintf(stderr, fmts, va);
|
|
va_end(va);
|
|
}
|
|
|
|
message_fn xalloc_err_handler = xdefault_error;
|
|
|
|
|
|
void *xcalloc(unsigned int size) {
|
|
void * p;
|
|
|
|
if (size == 0)
|
|
++size;
|
|
p = calloc(1, size);
|
|
if (!p) {
|
|
xalloc_err_handler("%s failed to allocate %u bytes of memory", __func__, size);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
return p;
|
|
}
|
|
|
|
void *xmalloc(size_t size) {
|
|
void *p;
|
|
|
|
if (size == 0)
|
|
++size;
|
|
p = malloc(size);
|
|
if (!p) {
|
|
xalloc_err_handler("%s failed to allocate %zu bytes of memory", __func__, size);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
return(p);
|
|
}
|
|
|
|
void *xrealloc(void *oldp, unsigned int size) {
|
|
void *p;
|
|
|
|
if (size == 0)
|
|
++size;
|
|
p = realloc(oldp, size);
|
|
if (!p) {
|
|
xalloc_err_handler("%s failed to allocate %u bytes of memory", __func__, size);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
return(p);
|
|
}
|
|
|
|
char *xstrdup(const char *str) {
|
|
char *p = NULL;
|
|
|
|
if (str) {
|
|
unsigned int size = strlen(str) + 1;
|
|
p = malloc(size);
|
|
if (!p) {
|
|
xalloc_err_handler("%s failed to allocate %u bytes of memory", __func__, size);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
strcpy(p, str);
|
|
}
|
|
return(p);
|
|
}
|