Rename log() to tor_log() for logging

This is meant to avoid conflict with the built-in log() function in
math.h.  It resolves ticket 7599.  First reported by dhill.

This was generated with the following perl script:

 #!/usr/bin/perl -w -i -p

 s/\blog\(LOG_(ERR|WARN|NOTICE|INFO|DEBUG)\s*,\s*/log_\L$1\(/g;

 s/\blog\(/tor_log\(/g;

1 files changed, 8 insertions, 8 deletions

diff --git a/src/or/dns.c b/src/or/dns.c
index 68309a80df..edcf92e5b3 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -262,7 +262,7 @@ evdns_log_cb(int warn, const char *msg)
   int severity = warn ? LOG_WARN : LOG_INFO;
   if (!strcmpstart(msg, "Resolve requested for") &&
       get_options()->SafeLogging) {
-    log(LOG_INFO, LD_EXIT, "eventdns: Resolve requested.");
+    log_info(LD_EXIT, "eventdns: Resolve requested.");
     return;
   } else if (!strcmpstart(msg, "Search: ")) {
     return;
@@ -291,7 +291,7 @@ evdns_log_cb(int warn, const char *msg)
     control_event_server_status(LOG_WARN, "NAMESERVER_ALL_DOWN");
     all_down = 1;
   }
-  log(severity, LD_EXIT, "eventdns: %s", msg);
+  tor_log(severity, LD_EXIT, "eventdns: %s", msg);
 }
 
 /** Helper: passed to eventdns.c as a callback so it can generate random
@@ -835,7 +835,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve,
     return -1;
 
   if (address_is_invalid_destination(exitconn->base_.address, 0)) {
-    log(LOG_PROTOCOL_WARN, LD_EXIT,
+    tor_log(LOG_PROTOCOL_WARN, LD_EXIT,
         "Rejecting invalid destination address %s",
         escaped_safe_str(exitconn->base_.address));
     return -1;
@@ -1844,7 +1844,7 @@ wildcard_increment_answer(const char *id)
   if (*ip > 5 && n_wildcard_requests > 10) {
     if (!dns_wildcard_list) dns_wildcard_list = smartlist_new();
     if (!smartlist_contains_string(dns_wildcard_list, id)) {
-    log(dns_wildcard_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
+    tor_log(dns_wildcard_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
         "Your DNS provider has given \"%s\" as an answer for %d different "
         "invalid addresses. Apparently they are hijacking DNS failures. "
         "I'll try to correct for this by treating future occurrences of "
@@ -1876,7 +1876,7 @@ add_wildcarded_test_address(const char *address)
   smartlist_add(dns_wildcarded_test_address_list, tor_strdup(address));
   n = smartlist_len(dns_wildcarded_test_address_list);
   if (n > n_test_addrs/2) {
-    log(dns_wildcarded_test_address_notice_given ? LOG_INFO : LOG_NOTICE,
+    tor_log(dns_wildcarded_test_address_notice_given ? LOG_INFO : LOG_NOTICE,
         LD_EXIT, "Your DNS provider tried to redirect \"%s\" to a junk "
         "address.  It has done this with %d test addresses so far.  I'm "
         "going to stop being an exit node for now, since our DNS seems so "
@@ -1920,7 +1920,7 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl,
       }
     }
 
-    log(dns_wildcard_one_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
+    tor_log(dns_wildcard_one_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
         "Your DNS provider gave an answer for \"%s\", which "
         "is not supposed to exist. Apparently they are hijacking "
         "DNS failures. Trying to correct for this. We've noticed %d "
@@ -2151,8 +2151,8 @@ dump_dns_mem_usage(int severity)
   /* Print out the count and estimated size of our &cache_root.  It undercounts
      hostnames in cached reverse resolves.
    */
-  log(severity, LD_MM, "Our DNS cache has %d entries.", hash_count);
-  log(severity, LD_MM, "Our DNS cache size is approximately %u bytes.",
+  tor_log(severity, LD_MM, "Our DNS cache has %d entries.", hash_count);
+  tor_log(severity, LD_MM, "Our DNS cache size is approximately %u bytes.",
       (unsigned)hash_mem);
 }