Use __func__ instead of __FUNCTION__.

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changes
 - The logging of the NASL internal regexp functions was extended to include the pattern in case of a failed regcomp(). [#397](https://github.com/greenbone/openvas/pull/397)
 - Add config for gpg keyring path (OPENVAS_GPG_BASE_DIR) [#407](https://github.com/greenbone/openvas/pull/407)
+- Use __func__ instead of __FUNCTION__ [#419](https://github.com/greenbone/openvas/pull/419)
 
 [Unreleased]: https://github.com/greenbone/openvas/compare/openvas-7.0...master
 

misc/pcap.c

@@ -958,7 +958,7 @@ v6_routethrough (struct in6_addr *dest, struct in6_addr *source)
   else
     g_message ("%s: Provided technique is neither proc route nor"
                " connect socket",
-               __FUNCTION__);
+               __func__);
   return NULL;
 }
 

misc/plugutils.c

@@ -181,7 +181,7 @@ plug_add_host_fqdn (struct script_infos *args, const char *hostname,
 
       if (!strcmp (tmp->value, hostname))
         {
-          g_warning ("%s: Value '%s' exists already", __FUNCTION__, hostname);
+          g_warning ("%s: Value '%s' exists already", __func__, hostname);
           return -1;
         }
       vhosts = vhosts->next;

nasl/nasl_cert.c

@@ -222,7 +222,7 @@ nasl_cert_open (lex_ctxt *lexic)
   obj = g_try_malloc (sizeof *obj);
   if (!obj)
     {
-      g_message ("malloc failed in %s", __FUNCTION__);
+      g_message ("malloc failed in %s", __func__);
       ksba_cert_release (cert);
       return NULL;
     }

nasl/nasl_cmd_exec.c

@@ -191,7 +191,7 @@ nasl_pread (lex_ctxt *lexic)
     {
       if (error)
         {
-          g_warning ("%s: %s", __FUNCTION__, error->message);
+          g_warning ("%s: %s", __func__, error->message);
           g_error_free (error);
         }
       goto finish_pread;

nasl/nasl_grammar.y

@@ -625,7 +625,7 @@ load_checksums (kb_t kb)
   file = fopen (filename, "r");
   if (!file)
     {
-      g_warning ("%s: Couldn't read file %s", __FUNCTION__, filename);
+      g_warning ("%s: Couldn't read file %s", __func__, filename);
       return;
     }
   if (checksum_algorithm == GCRY_MD_MD5)
@@ -649,7 +649,7 @@ load_checksums (kb_t kb)
       splits = g_strsplit (buffer, "  ", -1);
       if (g_strv_length (splits) != 2)
         {
-          g_warning ("%s: Erroneous checksum entry %s", __FUNCTION__, buffer);
+          g_warning ("%s: Erroneous checksum entry %s", __func__, buffer);
           g_strfreev (splits);
           break;
         }

nasl/nasl_host.c

@@ -120,7 +120,7 @@ add_hostname (lex_ctxt *lexic)
 
   if (!value)
     {
-      nasl_perror (lexic, "%s: Empty hostname\n", __FUNCTION__);
+      nasl_perror (lexic, "%s: Empty hostname\n", __func__);
       return NULL;
     }
   if (!source || !*source)
@@ -152,7 +152,7 @@ resolve_hostname (lex_ctxt *lexic)
 
   if (!value)
     {
-      nasl_perror (lexic, "%s: Empty hostname\n", __FUNCTION__);
+      nasl_perror (lexic, "%s: Empty hostname\n", __func__);
       return NULL;
     }
 

src/pluginlaunch.c

@@ -417,7 +417,7 @@ pluginlaunch_wait_for_free_process (kb_t kb)
       sigemptyset (&mask);
       sigaddset (&mask, SIGCHLD);
       if (sigtimedwait (&mask, NULL, &ts) < 0 && errno != EAGAIN)
-        g_warning ("%s: %s", __FUNCTION__, strerror (errno));
+        g_warning ("%s: %s", __func__, strerror (errno));
       update_running_processes (kb);
     }
 }