replaced mpd_malloc by G_GNUC_MALLOC
We want to remove gcc.h eventually. This takes care of all the G_GNUC_MALLOC macros.
This commit is contained in:
parent
2720585731
commit
c252143d51
|
@ -47,7 +47,7 @@ static unsigned calc_hash(const char *p) {
|
||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
mpd_malloc struct strset *strset_new(void)
|
G_GNUC_MALLOC struct strset *strset_new(void)
|
||||||
{
|
{
|
||||||
struct strset *set = xcalloc(1, sizeof(*set));
|
struct strset *set = xcalloc(1, sizeof(*set));
|
||||||
return set;
|
return set;
|
||||||
|
|
|
@ -28,11 +28,11 @@
|
||||||
#ifndef MPD_STRSET_H
|
#ifndef MPD_STRSET_H
|
||||||
#define MPD_STRSET_H
|
#define MPD_STRSET_H
|
||||||
|
|
||||||
#include "gcc.h"
|
#include <glib.h>
|
||||||
|
|
||||||
struct strset;
|
struct strset;
|
||||||
|
|
||||||
mpd_malloc struct strset *strset_new(void);
|
G_GNUC_MALLOC struct strset *strset_new(void);
|
||||||
|
|
||||||
void strset_free(struct strset *set);
|
void strset_free(struct strset *set);
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ int ipv6Supported(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
mpd_malloc char *xstrdup(const char *s)
|
G_GNUC_MALLOC char *xstrdup(const char *s)
|
||||||
{
|
{
|
||||||
char *ret = strdup(s);
|
char *ret = strdup(s);
|
||||||
if (G_UNLIKELY(!ret))
|
if (G_UNLIKELY(!ret))
|
||||||
|
@ -86,7 +86,7 @@ mpd_malloc char *xstrdup(const char *s)
|
||||||
|
|
||||||
/* borrowed from git :) */
|
/* borrowed from git :) */
|
||||||
|
|
||||||
mpd_malloc void *xmalloc(size_t size)
|
G_GNUC_MALLOC void *xmalloc(size_t size)
|
||||||
{
|
{
|
||||||
void *ret;
|
void *ret;
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ mpd_malloc void *xmalloc(size_t size)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
mpd_malloc void *xrealloc(void *ptr, size_t size)
|
G_GNUC_MALLOC void *xrealloc(void *ptr, size_t size)
|
||||||
{
|
{
|
||||||
void *ret = realloc(ptr, size);
|
void *ret = realloc(ptr, size);
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ mpd_malloc void *xrealloc(void *ptr, size_t size)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
mpd_malloc void *xcalloc(size_t nmemb, size_t size)
|
G_GNUC_MALLOC void *xcalloc(size_t nmemb, size_t size)
|
||||||
{
|
{
|
||||||
void *ret;
|
void *ret;
|
||||||
|
|
||||||
|
|
11
src/utils.h
11
src/utils.h
|
@ -19,8 +19,7 @@
|
||||||
#ifndef MPD_UTILS_H
|
#ifndef MPD_UTILS_H
|
||||||
#define MPD_UTILS_H
|
#define MPD_UTILS_H
|
||||||
|
|
||||||
#include "gcc.h"
|
#include <glib.h>
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -74,13 +73,13 @@ static inline ssize_t xwrite(int fd, const void *buf, size_t len)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mpd_malloc char *xstrdup(const char *s);
|
G_GNUC_MALLOC char *xstrdup(const char *s);
|
||||||
|
|
||||||
mpd_malloc void *xmalloc(size_t size);
|
G_GNUC_MALLOC void *xmalloc(size_t size);
|
||||||
|
|
||||||
mpd_malloc void *xrealloc(void *ptr, size_t size);
|
G_GNUC_MALLOC void *xrealloc(void *ptr, size_t size);
|
||||||
|
|
||||||
mpd_malloc void *xcalloc(size_t nmemb, size_t size);
|
G_GNUC_MALLOC void *xcalloc(size_t nmemb, size_t size);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* free a const pointer - unfortunately free() expects a non-const
|
* free a const pointer - unfortunately free() expects a non-const
|
||||||
|
|
Loading…
Reference in New Issue