mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-18 02:38:56 +00:00
6e295186c7
At present malloc.h is included everywhere since it recently was added to
common.h in this commit:
4519668 mtd/nand/ubi: assortment of alignment fixes
This seems wasteful and unnecessary. We have been trying to trim down
common.h and put separate functions into separate header files and that
change goes in the opposite direction.
Move malloc_cache_aligned() to a new header so that this can be avoided.
The header would perhaps be better named as alignmem.h but it needs to be
included after common.h and people might be confused by this. With the name
memalign.h it fits nicely after malloc() in most cases.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
71 lines
1.7 KiB
C
71 lines
1.7 KiB
C
/* zutil.c -- target dependent utility functions for the compression library
|
|
* Copyright (C) 1995-2005 Jean-loup Gailly.
|
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
*/
|
|
|
|
/* @(#) $Id$ */
|
|
|
|
#include "zutil.h"
|
|
|
|
#ifndef NO_DUMMY_DECL
|
|
struct internal_state {int dummy;}; /* for buggy compilers */
|
|
#endif
|
|
|
|
const char * const z_errmsg[10] = {
|
|
"need dictionary", /* Z_NEED_DICT 2 */
|
|
"stream end", /* Z_STREAM_END 1 */
|
|
"", /* Z_OK 0 */
|
|
"file error", /* Z_ERRNO (-1) */
|
|
"stream error", /* Z_STREAM_ERROR (-2) */
|
|
"data error", /* Z_DATA_ERROR (-3) */
|
|
"insufficient memory", /* Z_MEM_ERROR (-4) */
|
|
"buffer error", /* Z_BUF_ERROR (-5) */
|
|
"incompatible version",/* Z_VERSION_ERROR (-6) */
|
|
""};
|
|
|
|
#ifdef DEBUG
|
|
|
|
#ifndef verbose
|
|
#define verbose 0
|
|
#endif
|
|
int z_verbose = verbose;
|
|
|
|
void z_error (m)
|
|
char *m;
|
|
{
|
|
fprintf(stderr, "%s\n", m);
|
|
hang ();
|
|
}
|
|
#endif
|
|
|
|
/* exported to allow conversion of error code to string for compress() and
|
|
* uncompress()
|
|
*/
|
|
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
|
|
|
|
#ifdef __UBOOT__
|
|
#include <malloc.h>
|
|
#else
|
|
#ifndef STDC
|
|
extern voidp malloc OF((uInt size));
|
|
extern voidp calloc OF((uInt items, uInt size));
|
|
extern void free OF((voidpf ptr));
|
|
#endif
|
|
#endif
|
|
|
|
voidpf zcalloc(voidpf opaque, unsigned items, unsigned size)
|
|
{
|
|
if (opaque)
|
|
items += size - size; /* make compiler happy */
|
|
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
|
|
(voidpf)calloc(items, size);
|
|
}
|
|
|
|
void zcfree(voidpf opaque, voidpf ptr, unsigned nb)
|
|
{
|
|
free(ptr);
|
|
if (opaque)
|
|
return; /* make compiler happy */
|
|
}
|
|
|
|
#endif /* MY_ZCALLOC */
|