better deprecation warnings

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2022-03-23 16:40:47 +01:00
parent dcee2eea91
commit 7111ee2f85

View File

@@ -675,48 +675,51 @@ void xmpp_rand_nonce(xmpp_rand_t *rand, char *output, size_t len);
#if defined(__GNUC__) #if defined(__GNUC__)
#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 405) #if (__GNUC__ * 100 + __GNUC_MINOR__ >= 405)
#define XMPP_DEPRECATED \ #define XMPP_DEPRECATED(x) __attribute__((deprecated("replaced by " #x)))
__attribute__((deprecated("Function is internal from next release on")))
#elif (__GNUC__ * 100 + __GNUC_MINOR__ >= 300) #elif (__GNUC__ * 100 + __GNUC_MINOR__ >= 300)
#define XMPP_DEPRECATED __attribute__((deprecated)) #define XMPP_DEPRECATED(x) __attribute__((deprecated))
#endif #endif
#elif defined(_MSC_VER) && _MSC_VER >= 1500 #elif defined(_MSC_VER) && _MSC_VER >= 1500
#define XMPP_DEPRECATED \ #define XMPP_DEPRECATED(x) __declspec(deprecated("replaced by " #x))
__declspec(deprecated("Function is internal from next release on"))
#else #else
#define XMPP_DEPRECATED #define XMPP_DEPRECATED(x)
#endif #endif
XMPP_DEPRECATED void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size); XMPP_DEPRECATED(internal) void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size);
XMPP_DEPRECATED void *xmpp_realloc(const xmpp_ctx_t *ctx, void *p, size_t size); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED char *xmpp_strdup(const xmpp_ctx_t *ctx, const char *s); void *xmpp_realloc(const xmpp_ctx_t *ctx, void *p, size_t size);
XMPP_DEPRECATED char * XMPP_DEPRECATED(internal)
xmpp_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len); char *xmpp_strdup(const xmpp_ctx_t *ctx, const char *s);
XMPP_DEPRECATED(internal)
char *xmpp_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len);
XMPP_DEPRECATED char *xmpp_strtok_r(char *s, const char *delim, char **saveptr); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED int char *xmpp_strtok_r(char *s, const char *delim, char **saveptr);
xmpp_snprintf(char *str, size_t count, const char *fmt, ...); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED int int xmpp_snprintf(char *str, size_t count, const char *fmt, ...);
xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list arg); XMPP_DEPRECATED(internal)
int xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
XMPP_DEPRECATED void xmpp_log(const xmpp_ctx_t *ctx, XMPP_DEPRECATED(internal)
xmpp_log_level_t level, void xmpp_log(const xmpp_ctx_t *ctx,
const char *area, xmpp_log_level_t level,
const char *fmt, const char *area,
va_list ap); const char *fmt,
XMPP_DEPRECATED void va_list ap);
xmpp_error(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED void void xmpp_error(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
xmpp_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED void void xmpp_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
xmpp_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED void void xmpp_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
xmpp_debug(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...); XMPP_DEPRECATED(internal)
XMPP_DEPRECATED void xmpp_debug_verbose( void xmpp_debug(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
XMPP_DEPRECATED(internal)
void xmpp_debug_verbose(
int level, const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...); int level, const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
XMPP_DEPRECATED void XMPP_DEPRECATED(xmpp_conn_set_sockopt_callback)
xmpp_conn_set_keepalive(xmpp_conn_t *conn, int timeout, int interval); void xmpp_conn_set_keepalive(xmpp_conn_t *conn, int timeout, int interval);
#ifdef __cplusplus #ifdef __cplusplus
} }