XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage

Browse Source 
C89 guarantees alignment of pointers returned from malloc/calloc/realloc, so
stop fiddling with alignment manually and just pass the arguments to library
functions.

Also convert silent error when negative size is passed into function into
warning in log file.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Mikhail Gusarov
2010-05-06 00:16:24 +07:00
parent 4f0006c220
commit e983848ab4
2 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/os.h
View File

@@ -214,15 +214,15 @@ extern _X_EXPORT int set_font_authorizations(
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
extern _X_EXPORT pointer Xalloc(unsigned long /*amount*/);
extern _X_EXPORT pointer Xcalloc(unsigned long /*amount*/);
extern _X_EXPORT pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/);
extern _X_EXPORT void Xfree(pointer /*ptr*/);
extern _X_EXPORT void *Xalloc(unsigned long /*amount*/);
extern _X_EXPORT void *Xcalloc(unsigned long /*amount*/);
extern _X_EXPORT void *Xrealloc(void * /*ptr*/, unsigned long /*amount*/);
extern _X_EXPORT void Xfree(void * /*ptr*/);
#endif
extern _X_EXPORT pointer XNFalloc(unsigned long /*amount*/);
extern _X_EXPORT pointer XNFcalloc(unsigned long /*amount*/);
extern _X_EXPORT pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/);
extern _X_EXPORT void *XNFalloc(unsigned long /*amount*/);
extern _X_EXPORT void *XNFcalloc(unsigned long /*amount*/);
extern _X_EXPORT void *XNFrealloc(void * /*ptr*/, unsigned long /*amount*/);
extern _X_EXPORT char *Xstrdup(const char *s);
extern _X_EXPORT char *XNFstrdup(const char *s);