shill: Rename SMLOG to SLOG
Rewrite SMLOG as SLOG, thus saving many edits. Change the location of
the SLOG macro to be memory_log.h, requiring includes to be rewritten
and reordered. While we're rewriting includes, moving all assorted
logging includes into a generic shill/logging.h, thus saving future
logging changes from altering these includes ever again.
BUG=chromium-os:31145
TEST=Builds, unit tests still pass
Change-Id: Ie5129fcbdda87f3149460209a682c698b876b09a
Reviewed-on: https://gerrit.chromium.org/gerrit/29650
Commit-Ready: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Tested-by: Christopher Wiley <wiley@chromium.org>
diff --git a/dhcpcd_proxy.cc b/dhcpcd_proxy.cc
index ef53eb3..bebcad5 100644
--- a/dhcpcd_proxy.cc
+++ b/dhcpcd_proxy.cc
@@ -4,10 +4,10 @@
#include "shill/dhcpcd_proxy.h"
-#include <base/logging.h>
+#include <limits>
#include "shill/dhcp_provider.h"
-#include "shill/scope_logger.h"
+#include "shill/logging.h"
using std::string;
using std::vector;
@@ -34,7 +34,7 @@
void DHCPCDListener::Proxy::EventSignal(const DBus::SignalMessage &signal) {
SLOG(DBus, 2) << __func__;
DBus::MessageIter ri = signal.reader();
- unsigned int pid;
+ unsigned int pid = std::numeric_limits<unsigned int>::max();
try {
ri >> pid;
} catch (const DBus::Error &e) {
@@ -74,7 +74,7 @@
const DBus::SignalMessage &signal) {
SLOG(DBus, 2) << __func__;
DBus::MessageIter ri = signal.reader();
- unsigned int pid;
+ unsigned int pid = std::numeric_limits<unsigned int>::max();
try {
ri >> pid;
} catch (const DBus::Error &e) {