mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-27 01:40:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use __func__ instead of __FUNCTION__

Browse source 
They are equivalent, but __func__ is in C99. __FUNCTION__ exists only
for backwards compatibility with old gcc versions.

Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Michael Forney 2019-06-11 23:08:09 -07:00 • committed by Takashi Iwai
parent 5905af1996
commit 0baf7b377c
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aserver/aserver.c
View file

@ -39,13 +39,13 @@ char *command;
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ERROR(...) do {\ #define ERROR(...) do {\
fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __FUNCTION__); \ fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __func__); \
fprintf(stderr, __VA_ARGS__); \ fprintf(stderr, __VA_ARGS__); \
putc('\n', stderr); \ putc('\n', stderr); \
} while (0) } while (0)
#else #else
#define ERROR(args...) do {\ #define ERROR(args...) do {\
fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __FUNCTION__); \ fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __func__); \
fprintf(stderr, ##args); \ fprintf(stderr, ##args); \
putc('\n', stderr); \ putc('\n', stderr); \
} while (0) } while (0)

8
include/error.h
View file

@ -61,11 +61,11 @@ extern snd_lib_error_handler_t snd_lib_error;
extern int snd_lib_error_set_handler(snd_lib_error_handler_t handler); extern int snd_lib_error_set_handler(snd_lib_error_handler_t handler);
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 95) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 95)
#define SNDERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__) /**< Shows a sound error message. */ #define SNDERR(...) snd_lib_error(__FILE__, __LINE__, __func__, 0, __VA_ARGS__) /**< Shows a sound error message. */
#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__) /**< Shows a system error message (related to \c errno). */ #define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __func__, errno, __VA_ARGS__) /**< Shows a system error message (related to \c errno). */
#else #else
#define SNDERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args) /**< Shows a sound error message. */ #define SNDERR(args...) snd_lib_error(__FILE__, __LINE__, __func__, 0, ##args) /**< Shows a sound error message. */
#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args) /**< Shows a system error message (related to \c errno). */ #define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __func__, errno, ##args) /**< Shows a system error message (related to \c errno). */
#endif #endif
/** \} */ /** \} */

4
include/local.h
View file

@ -244,8 +244,8 @@ size_t snd_strlcpy(char *dst, const char *src, size_t size);
#ifndef NDEBUG #ifndef NDEBUG
#define CHECK_SANITY(x) x #define CHECK_SANITY(x) x
extern snd_lib_error_handler_t snd_err_msg; extern snd_lib_error_handler_t snd_err_msg;
#define SNDMSG(args...) snd_err_msg(__FILE__, __LINE__, __FUNCTION__, 0, ##args) #define SNDMSG(args...) snd_err_msg(__FILE__, __LINE__, __func__, 0, ##args)
#define SYSMSG(args...) snd_err_msg(__FILE__, __LINE__, __FUNCTION__, errno, ##args) #define SYSMSG(args...) snd_err_msg(__FILE__, __LINE__, __func__, errno, ##args)
#else #else
#define CHECK_SANITY(x) 0 /* not evaluated */ #define CHECK_SANITY(x) 0 /* not evaluated */
#define SNDMSG(args...) /* nop */ #define SNDMSG(args...) /* nop */

4
src/pcm/pcm_share.c
View file

@ -54,11 +54,11 @@ char *snd_pcm_share_slaves_mutex_holder;
do { \ do { \
int err = pthread_mutex_trylock(mutex); \ int err = pthread_mutex_trylock(mutex); \
if (err < 0) { \ if (err < 0) { \
fprintf(stderr, "lock " #mutex " is busy (%s): waiting in " __FUNCTION__ "\n", *(mutex##_holder)); \ fprintf(stderr, "lock " #mutex " is busy (%s): waiting in " __func__ "\n", *(mutex##_holder)); \
pthread_mutex_lock(mutex); \ pthread_mutex_lock(mutex); \
fprintf(stderr, "... got\n"); \ fprintf(stderr, "... got\n"); \
} \ } \
*(mutex##_holder) = __FUNCTION__; \ *(mutex##_holder) = __func__; \
} while (0) } while (0)
#define Pthread_mutex_unlock(mutex) \ #define Pthread_mutex_unlock(mutex) \