BIND 10 trac901, updated. c3dad479414b01979693ba71c832aedd681f5044 [trac901] Add missing file

BIND 10 source code commits bind10-changes at lists.isc.org
Thu May 5 10:15:43 UTC 2011


The branch, trac901 has been updated
       via  c3dad479414b01979693ba71c832aedd681f5044 (commit)
      from  a23491a635d7f74132fc0b91eac832275f8f1f87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c3dad479414b01979693ba71c832aedd681f5044
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu May 5 12:15:31 2011 +0200

    [trac901] Add missing file

-----------------------------------------------------------------------

Summary of changes:
 .../log/{root_logger_name.cc => log_formatter.cc}  |   39 +++++++++-----------
 src/lib/log/log_formatter.h                        |    5 ++-
 2 files changed, 20 insertions(+), 24 deletions(-)
 copy src/lib/log/{root_logger_name.cc => log_formatter.cc} (60%)

-----------------------------------------------------------------------
diff --git a/src/lib/log/log_formatter.cc b/src/lib/log/log_formatter.cc
new file mode 100644
index 0000000..920d7dd
--- /dev/null
+++ b/src/lib/log/log_formatter.cc
@@ -0,0 +1,39 @@
+// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+#include <log/log_formatter.h>
+
+using namespace std;
+using namespace boost;
+
+namespace isc {
+namespace log {
+
+void
+replacePlaceholder(string* message, const string& arg,
+                   const unsigned placeholder)
+{
+    string mark("%" + lexical_cast<string>(placeholder));
+    size_t pos(message->find(mark));
+    if (pos != string::npos) {
+        message->replace(pos, mark.size(), arg);
+    } else {
+        // We're missing the placeholder, so add some complain
+        message->append(" @@Missing placeholder " + mark + " for '" + arg +
+                        "'@@");
+    }
+}
+
+}
+}
diff --git a/src/lib/log/log_formatter.h b/src/lib/log/log_formatter.h
index e7f5128..d8a2a6d 100644
--- a/src/lib/log/log_formatter.h
+++ b/src/lib/log/log_formatter.h
@@ -26,8 +26,9 @@ namespace log {
 /// This is used internally by the Formatter. Replaces a placeholder
 /// in the message by replacement. If the placeholder is not found,
 /// it adds a complain at the end.
-void replacePlaceholder(std::string* message, const std::string& replacement,
-                        const unsigned placeholder);
+void
+replacePlaceholder(std::string* message, const std::string& replacement,
+                   const unsigned placeholder);
 
 ///
 /// \brief The log message formatter




More information about the bind10-changes mailing list