diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-05-15 19:01:40 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-05-15 19:01:40 +0000 |
| commit | 1a74c43c0e545f41b6266713362c42748ee579e8 (patch) | |
| tree | e9332e214e2c5ad2f946336e475ed171f5cc3607 | |
| parent | 16232bdd339cb8bf4ef9e7d51ce1bcafa574155a (diff) | |
| parent | d42c42d999ecc0bfc3adfd684f1dc4b6960a4d9d (diff) | |
| download | dbus-1a74c43c0e545f41b6266713362c42748ee579e8.tar.gz | |
Merge branch 'use_func_macro' into 'master'
do not use __FUNCTION__ directly
See merge request dbus/dbus!404
| -rw-r--r-- | dbus/dbus-internals.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-spawn-win.c | 8 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-win.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 2387752d..4aef24ca 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -104,7 +104,7 @@ int _dbus_get_check_failed_count (void); DBUS_PRIVATE_EXPORT void _dbus_verbose_real (const char *file, const int line, const char *function, const char *format,...) _DBUS_GNUC_PRINTF (4, 5); -# define _dbus_verbose(fmt,...) _dbus_verbose_real( __FILE__,__LINE__,__FUNCTION__,fmt, ## __VA_ARGS__) +# define _dbus_verbose(fmt,...) _dbus_verbose_real( __FILE__,__LINE__,_DBUS_FUNCTION_NAME,fmt, ## __VA_ARGS__) #else DBUS_PRIVATE_EXPORT void _dbus_verbose_real (const char *format, diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c index 3b4bc052..5ad4fe5f 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -5,7 +5,7 @@ #if !defined(SPAWN_DEBUG) || defined(_MSC_VER) #define PING() #else -#define PING() fprintf (stderr, "%s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__); fflush (stderr) +#define PING() fprintf (stderr, "%s:%s:%d\n", __FILE__, _DBUS_FUNCTION_NAME, __LINE__); fflush (stderr) #endif #include <stdio.h> @@ -107,7 +107,7 @@ _dbus_babysitter_new (void) old_refcount = _dbus_atomic_inc (&sitter->refcount); - _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, __FUNCTION__); + _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, _DBUS_FUNCTION_NAME); sitter->child_handle = NULL; @@ -141,7 +141,7 @@ _dbus_babysitter_ref (DBusBabysitter *sitter) old_refcount = _dbus_atomic_inc (&sitter->refcount); _dbus_assert (old_refcount > 0); - _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, __FUNCTION__); + _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, _DBUS_FUNCTION_NAME); return sitter; } @@ -182,7 +182,7 @@ _dbus_babysitter_unref (DBusBabysitter *sitter) old_refcount = _dbus_atomic_dec (&sitter->refcount); _dbus_assert (old_refcount > 0); - _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount-1, __FUNCTION__); + _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount-1, _DBUS_FUNCTION_NAME); if (old_refcount == 1) { diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 11064bb4..fa408328 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -1019,12 +1019,12 @@ _dbus_getsid(char **sid, dbus_pid_t process_id) psid = token_user->User.Sid; if (!IsValidSid (psid)) { - _dbus_verbose("%s invalid sid\n",__FUNCTION__); + _dbus_verbose("invalid sid\n"); goto failed; } if (!ConvertSidToStringSidA (psid, sid)) { - _dbus_verbose("%s invalid sid\n",__FUNCTION__); + _dbus_verbose("invalid sid\n"); goto failed; } //okay: |