diff options
| author | Przemyslaw Pawelczyk <przemoc@gmail.com> | 2016-02-05 23:58:09 +0100 |
|---|---|---|
| committer | Przemyslaw Pawelczyk <przemoc@gmail.com> | 2016-02-05 23:58:09 +0100 |
| commit | b390d44bf2573d7bc0b97f19db7969bb2a26aa55 (patch) | |
| tree | dee27954ca768e65274e217e5cd6ba7ab9903bc9 | |
| parent | feea01c8e5df240b99474a408b45933c6e96147b (diff) | |
Use C99 predefined identifier __func__ instead of non-std __FUNCTION__.
| -rw-r--r-- | src/metaentry.c | 6 | ||||
| -rw-r--r-- | src/metastore.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/metaentry.c b/src/metaentry.c index d70a4dd..2f850fd 100644 --- a/src/metaentry.c +++ b/src/metaentry.c @@ -109,7 +109,7 @@ mentry_find(const char *path, struct metahash *mhash) unsigned key; if (!mhash) { - msg(MSG_ERROR, "%s called with empty hash table\n", __FUNCTION__); + msg(MSG_ERROR, "%s called with empty hash table\n", __func__); return NULL; } @@ -569,7 +569,7 @@ mentry_compare(struct metaentry *left, struct metaentry *right, msettings *st) int retval = DIFF_NONE; if (!left || !right) { - msg(MSG_ERROR, "%s called with empty list\n", __FUNCTION__); + msg(MSG_ERROR, "%s called with empty list\n", __func__); return -1; } @@ -614,7 +614,7 @@ mentries_compare(struct metahash *mhashreal, int key; if (!mhashreal || !mhashstored) { - msg(MSG_ERROR, "%s called with empty list\n", __FUNCTION__); + msg(MSG_ERROR, "%s called with empty list\n", __func__); return; } diff --git a/src/metastore.c b/src/metastore.c index 4ac2654..56fc655 100644 --- a/src/metastore.c +++ b/src/metastore.c @@ -91,7 +91,7 @@ static void compare_print(struct metaentry *real, struct metaentry *stored, int cmp) { if (!real && !stored) { - msg(MSG_ERROR, "%s called with incorrect arguments\n", __FUNCTION__); + msg(MSG_ERROR, "%s called with incorrect arguments\n", __func__); return; } @@ -136,8 +136,7 @@ compare_fix(struct metaentry *real, struct metaentry *stored, int cmp) unsigned i; if (!real && !stored) { - msg(MSG_ERROR, "%s called with incorrect arguments\n", - __FUNCTION__); + msg(MSG_ERROR, "%s called with incorrect arguments\n", __func__); return; } |