diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 00:16:24 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:20:32 +0700 |
| commit | e983848ab44b0769f97f6207f1aa8b4f127be6a9 (patch) | |
| tree | 8720b60558a3a5fab7b968ab514f1f9ec71863e9 /include/os.h | |
| parent | 4f0006c2203abe0b7660c5068d6afe236f9bd2a4 (diff) | |
Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage
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>
Diffstat (limited to 'include/os.h')
| -rw-r--r-- | include/os.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/os.h b/include/os.h index 3b07bdee9..b49117728 100644 --- a/include/os.h +++ b/include/os.h @@ -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); |