From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 31 Oct 2012 07:34:03 +0000 (+0530)
Subject: [2369] Use createSreamName() from #2371 instead of using sprintf()
X-Git-Tag: trac2487_base~18^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dd898f80907bcb0180858a3a1b2811c803012a9;p=thirdparty%2Fkea.git

[2369] Use createSreamName() from #2371 instead of using sprintf()
---

diff --git a/src/lib/dns/inputsource.cc b/src/lib/dns/inputsource.cc
index f52f493db7..051705b9b7 100644
--- a/src/lib/dns/inputsource.cc
+++ b/src/lib/dns/inputsource.cc
@@ -14,25 +14,29 @@
 
 #include <dns/inputsource.h>
 
-#include <cstdio>
-
-using namespace std;
-
 namespace isc {
 namespace dns {
 namespace master_lexer_internal {
 
+namespace { // unnamed namespace
+
+std::string
+createStreamName(std::istream& input_stream) {
+     std::stringstream ss;
+     ss << "stream-" << &input_stream;
+     return (ss.str());
+}
+
+} // end of unnamed namespace
+
 InputSource::InputSource(std::istream& input_stream) :
     at_eof_(false),
     line_(1),
     saved_line_(line_),
     buffer_pos_(buffer_.size()),
+    name_(createStreamName(input_stream)),
     input_(input_stream)
-{
-    char buf[FILENAME_MAX];
-    snprintf(buf, sizeof(buf), "stream-%p", &input_stream);
-    name_ = buf;
-}
+{}
 
 InputSource::InputSource(const char* filename) :
     at_eof_(false),
@@ -42,7 +46,7 @@ InputSource::InputSource(const char* filename) :
     name_(filename),
     input_(file_stream_)
 {
-    file_stream_.open(filename, fstream::in);
+    file_stream_.open(filename, std::fstream::in);
 }
 
 InputSource::~InputSource()