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;

7 files changed, 29 insertions, 29 deletions

diff --git a/src/common/address.c b/src/common/address.c
index 3529b10c1a..6fc9fb3c47 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1270,14 +1270,14 @@ get_interface_addresses_raw(int severity)
   /* This interface, AFAICT, only supports AF_INET addresses */
   fd = socket(AF_INET, SOCK_DGRAM, 0);
   if (fd < 0) {
-    log(severity, LD_NET, "socket failed: %s", strerror(errno));
+    tor_log(severity, LD_NET, "socket failed: %s", strerror(errno));
     goto done;
   }
   /* Guess how much space we need. */
   ifc.ifc_len = sz = 15*1024;
   ifc.ifc_ifcu.ifcu_req = tor_malloc(sz);
   if (ioctl(fd, SIOCGIFCONF, &ifc) < 0) {
-    log(severity, LD_NET, "ioctl failed: %s", strerror(errno));
+    tor_log(severity, LD_NET, "ioctl failed: %s", strerror(errno));
     close(fd);
     goto done;
   }
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 8cbb0db8ef..200a7c65fb 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -76,19 +76,19 @@ libevent_logging_callback(int severity, const char *msg)
   }
   switch (severity) {
     case _EVENT_LOG_DEBUG:
-      log(LOG_DEBUG, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
+      log_debug(LD_NOCB|LD_NET, "Message from libevent: %s", buf);
       break;
     case _EVENT_LOG_MSG:
-      log(LOG_INFO, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
+      log_info(LD_NOCB|LD_NET, "Message from libevent: %s", buf);
       break;
     case _EVENT_LOG_WARN:
-      log(LOG_WARN, LD_NOCB|LD_GENERAL, "Warning from libevent: %s", buf);
+      log_warn(LD_NOCB|LD_GENERAL, "Warning from libevent: %s", buf);
       break;
     case _EVENT_LOG_ERR:
-      log(LOG_ERR, LD_NOCB|LD_GENERAL, "Error from libevent: %s", buf);
+      log_err(LD_NOCB|LD_GENERAL, "Error from libevent: %s", buf);
       break;
     default:
-      log(LOG_WARN, LD_NOCB|LD_GENERAL, "Message [%d] from libevent: %s",
+      log_warn(LD_NOCB|LD_GENERAL, "Message [%d] from libevent: %s",
           severity, buf);
       break;
   }
@@ -261,13 +261,13 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg)
 #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
   /* Making this a NOTICE for now so we can link bugs to a libevent versions
    * or methods better. */
-  log(LOG_INFO, LD_GENERAL,
+  log_info(LD_GENERAL,
       "Initialized libevent version %s using method %s. Good.",
       event_get_version(), tor_libevent_get_method());
 #else
-  log(LOG_NOTICE, LD_GENERAL,
+  log_notice(LD_GENERAL,
       "Initialized old libevent (version 1.0b or earlier).");
-  log(LOG_WARN, LD_GENERAL,
+  log_warn(LD_GENERAL,
       "You have a *VERY* old version of libevent.  It is likely to be buggy; "
       "please build Tor with a more recent version.");
 #endif
@@ -440,7 +440,7 @@ tor_check_libevent_header_compatibility(void)
 
     verybad = compat1 != compat2;
 
-    log(verybad ? LOG_WARN : LOG_NOTICE,
+    tor_log(verybad ? LOG_WARN : LOG_NOTICE,
         LD_GENERAL, "We were compiled with headers from version %s "
         "of Libevent, but we're using a Libevent library that says it's "
         "version %s.", HEADER_VERSION, event_get_version());
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 7c73f79cff..7cfe2a8370 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -151,10 +151,10 @@ crypto_log_errors(int severity, const char *doing)
     if (!lib) lib = "(null)";
     if (!func) func = "(null)";
     if (doing) {
-      log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",
+      tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",
           doing, msg, lib, func);
     } else {
-      log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func);
+      tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func);
     }
   }
 }
@@ -168,10 +168,10 @@ log_engine(const char *fn, ENGINE *e)
     const char *name, *id;
     name = ENGINE_get_name(e);
     id = ENGINE_get_id(e);
-    log(LOG_NOTICE, LD_CRYPTO, "Using OpenSSL engine %s [%s] for %s",
+    log_notice(LD_CRYPTO, "Using OpenSSL engine %s [%s] for %s",
         name?name:"?", id?id:"?", fn);
   } else {
-    log(LOG_INFO, LD_CRYPTO, "Using default implementation for %s", fn);
+    log_info(LD_CRYPTO, "Using default implementation for %s", fn);
   }
 }
 #endif
diff --git a/src/common/procmon.c b/src/common/procmon.c
index efb39e5bb7..0a49689e3a 100644
--- a/src/common/procmon.c
+++ b/src/common/procmon.c
@@ -321,7 +321,7 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2,
   its_dead_jim = its_dead_jim && (errno == ESRCH);
 #endif
 
-  log(its_dead_jim ? LOG_NOTICE : LOG_INFO,
+  tor_log(its_dead_jim ? LOG_NOTICE : LOG_INFO,
       procmon->log_domain, "Monitored process "PID_T_FORMAT" is %s.",
       procmon->pid,
       its_dead_jim ? "dead" : "still alive");
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 97271fa81e..b487e0e692 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -153,7 +153,7 @@ void set_log_time_granularity(int granularity_msec);
 
 void tor_log(int severity, log_domain_mask_t domain, const char *format, ...)
   CHECK_PRINTF(3,4);
-#define log tor_log /* hack it so we don't conflict with log() as much */
+#define log tor_log /* hack it so we don't conflict with tor_log() as much */
 
 #if defined(__GNUC__) || defined(RUNNING_DOXYGEN)
 extern int log_global_min_severity_;
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 6151d3fde4..94cedba24b 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -334,11 +334,11 @@ tor_tls_log_one_error(tor_tls_t *tls, unsigned long err,
   if (!lib) lib = "(null)";
   if (!func) func = "(null)";
   if (doing) {
-    log(severity, domain, "TLS error while %s%s%s: %s (in %s:%s:%s)",
+    tor_log(severity, domain, "TLS error while %s%s%s: %s (in %s:%s:%s)",
         doing, addr?" with ":"", addr?addr:"",
         msg, lib, func, state);
   } else {
-    log(severity, domain, "TLS error%s%s: %s (in %s:%s:%s)",
+    tor_log(severity, domain, "TLS error%s%s: %s (in %s:%s:%s)",
         addr?" with ":"", addr?addr:"",
         msg, lib, func, state);
   }
@@ -427,12 +427,12 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra,
       if (extra&CATCH_SYSCALL)
         return TOR_TLS_SYSCALL_;
       if (r == 0) {
-        log(severity, LD_NET, "TLS error: unexpected close while %s (%s)",
+        tor_log(severity, LD_NET, "TLS error: unexpected close while %s (%s)",
             doing, SSL_state_string_long(tls->ssl));
         tor_error = TOR_TLS_ERROR_IO;
       } else {
         int e = tor_socket_errno(tls->socket);
-        log(severity, LD_NET,
+        tor_log(severity, LD_NET,
             "TLS error: <syscall error while %s> (errno=%d: %s; state=%s)",
             doing, e, tor_socket_strerror(e),
             SSL_state_string_long(tls->ssl));
@@ -443,7 +443,7 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra,
     case SSL_ERROR_ZERO_RETURN:
       if (extra&CATCH_ZERO)
         return TOR_TLS_ZERORETURN_;
-      log(severity, LD_NET, "TLS connection closed while %s in state %s",
+      tor_log(severity, LD_NET, "TLS connection closed while %s in state %s",
           doing, SSL_state_string_long(tls->ssl));
       tls_log_errors(tls, severity, domain, doing);
       return TOR_TLS_CLOSE;
@@ -1224,7 +1224,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime,
     authcert = tor_tls_create_certificate(rsa_auth, identity, nickname, nn2,
                                           key_lifetime);
     if (!cert || !idcert || !authcert) {
-      log(LOG_WARN, LD_CRYPTO, "Error creating certificate");
+      log_warn(LD_CRYPTO, "Error creating certificate");
       goto error;
     }
   }
@@ -2272,7 +2272,7 @@ tor_tls_shutdown(tor_tls_t *tls)
        */
       if (tls->state == TOR_TLS_ST_GOTCLOSE ||
          tls->state == TOR_TLS_ST_SENTCLOSE) {
-        log(LOG_WARN, LD_NET,
+        log_warn(LD_NET,
             "TLS returned \"half-closed\" value while already half-closed");
         return TOR_TLS_ERROR_MISC;
       }
@@ -2322,7 +2322,7 @@ log_cert_lifetime(int severity, const X509 *cert, const char *problem)
   struct tm tm;
 
   if (problem)
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "Certificate %s. Either their clock is set wrong, or your clock "
         "is wrong.",
            problem);
@@ -2347,7 +2347,7 @@ log_cert_lifetime(int severity, const X509 *cert, const char *problem)
 
   strftime(mytime, 32, "%b %d %H:%M:%S %Y UTC", tor_gmtime_r(&now, &tm));
 
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       "(certificate lifetime runs from %s through %s. Your time is %s.)",
       s1,s2,mytime);
 
@@ -2568,7 +2568,7 @@ check_no_tls_errors_(const char *fname, int line)
 {
   if (ERR_peek_error() == 0)
     return;
-  log(LOG_WARN, LD_CRYPTO, "Unhandled OpenSSL errors found at %s:%d: ",
+  log_warn(LD_CRYPTO, "Unhandled OpenSSL errors found at %s:%d: ",
       tor_fix_source_file(fname), line);
   tls_log_errors(NULL, LOG_WARN, LD_NET, NULL);
 }
diff --git a/src/common/util.c b/src/common/util.c
index 49ec75dc4a..414efce5f4 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -324,12 +324,12 @@ tor_log_mallinfo(int severity)
 
 /**
  * Returns the natural logarithm of d base 2.  We define this wrapper here so
- * as to make it easier not to conflict with Tor's log() macro.
+ * as to make it easier not to conflict with Tor's tor_log() macro.
  */
 double
 tor_mathlog(double d)
 {
-  return log(d);
+  return tor_log(d);
 }
 
 /** Return the long integer closest to <b>d</b>. We define this wrapper