summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2013-09-10 16:11:37 +0300
committerJohan Hedberg <johan.hedberg@intel.com>2013-09-11 13:22:08 +0300
commitc64fd37802d3609522d8121a21126ea797bf4e23 (patch)
tree9ff7c637ec2ed809670e46b9b6aef542cd97b8d4
parent84a07386222ca2bc497a24c479cb1f145251fe6e (diff)
codingstyle: Change __FUNCTION__ to __func__
The __func__ macro is part of the C99 standard whereas __FUNCTION__ is a legacy gcc specific alias for it: http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html Additionally, checkpatch.pl that's commonly used to verify coding style also recommends to use __func__ instead of __FUNCTION__.
-rw-r--r--attrib/gattrib.c2
-rw-r--r--gobex/gobex-debug.h2
-rw-r--r--obexd/src/log.h2
-rw-r--r--src/log.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index c662acebe..609b908be 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -718,7 +718,7 @@ gboolean g_attrib_unregister(GAttrib *attrib, guint id)
GSList *l;
if (id == 0) {
- warn("%s: invalid id", __FUNCTION__);
+ warn("%s: invalid id", __func__);
return FALSE;
}
diff --git a/gobex/gobex-debug.h b/gobex/gobex-debug.h
index 688466ef5..a98653d83 100644
--- a/gobex/gobex-debug.h
+++ b/gobex/gobex-debug.h
@@ -40,7 +40,7 @@ extern guint gobex_debug;
#define g_obex_debug(level, format, ...) \
if (gobex_debug & level) \
g_log("gobex", G_LOG_LEVEL_DEBUG, "%s:%s() " format, __FILE__, \
- __FUNCTION__, ## __VA_ARGS__)
+ __func__, ## __VA_ARGS__)
static inline void g_obex_dump(guint level, const char *prefix,
const void *buf, gsize len)
diff --git a/obexd/src/log.h b/obexd/src/log.h
index 1bf1b058b..d9fb8678f 100644
--- a/obexd/src/log.h
+++ b/obexd/src/log.h
@@ -52,5 +52,5 @@ struct obex_debug_desc {
.file = __FILE__, .flags = OBEX_DEBUG_FLAG_DEFAULT, \
}; \
if (__obex_debug_desc.flags & OBEX_DEBUG_FLAG_PRINT) \
- obex_debug("%s:%s() " fmt, __FILE__, __FUNCTION__ , ## arg); \
+ obex_debug("%s:%s() " fmt, __FILE__, __func__ , ## arg); \
} while (0)
diff --git a/src/log.h b/src/log.h
index 3d34fa377..bf9eac2aa 100644
--- a/src/log.h
+++ b/src/log.h
@@ -55,5 +55,5 @@ void __btd_enable_debug(struct btd_debug_desc *start,
.file = __FILE__, .flags = BTD_DEBUG_FLAG_DEFAULT, \
}; \
if (__btd_debug_desc.flags & BTD_DEBUG_FLAG_PRINT) \
- btd_debug("%s:%s() " fmt, __FILE__, __FUNCTION__ , ## arg); \
+ btd_debug("%s:%s() " fmt, __FILE__, __func__ , ## arg); \
} while (0)