mu: don't use __FUNCTION__, use __func__

__FUNCTION__ is deprecated and gives compilation warnings. __func__ is
standardized in c99.
This commit is contained in:
djcb
2015-04-22 21:06:31 +03:00
parent 0ffbb2e5f6
commit 7eb244b3b0
19 changed files with 49 additions and 50 deletions

View File

@ -134,7 +134,7 @@ print_expr (const char* frm, ...)
rv = write (outfd, "\n", 1);
if (rv == -1) {
g_critical ("%s: write() failed: %s",
__FUNCTION__, strerror(errno));
__func__, strerror(errno));
/* terminate ourselves */
raise (SIGTERM);
}
@ -976,14 +976,12 @@ cmd_find (ServerContext *ctx, GHashTable *args, GError **err)
static MuError
cmd_guile (ServerContext *ctx, GHashTable *args, GError **err)
{
const char *script, *file;
const char *eval;
script = get_string_from_args (args, "script", TRUE, NULL);
file = get_string_from_args (args, "file", TRUE, NULL);
if (!script == !file) {
print_error (MU_ERROR_IN_PARAMETERS,
"guile: must provide one of 'script', 'file'");
eval = get_string_from_args (args, "eval", TRUE, NULL);
if (!eval) {
print_error (MU_ERROR_IN_PARAMETERS, "guile: expected: 'eval'");
return MU_OK;
}