2008-04-26 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Added StringFormat class, which internally calls vasprintf.
	operator<< is defined for this class, so it can be used with iostream
	classes nicely. SimpleLogger and following functions are rewritten
	using StringFormat class.
	Besides, now Logger class's methods are non-const, many classes
	that has a const Logger* as a member variable are modified to remove
	const qualifier from the variable declaration.
	* src/HelpItemFactory.cc
	* src/Request.cc
	* src/SimpleLogger.cc
	* src/StringFormat.cc
	* src/StringFormat.h
	* src/Util.cc
	* src/option_processing.cc
	* src/version_usage.cc
	* test/StringFormatTest.cc
	* src/*.h: The classes that has const Logger* as a member variable.

1 files changed, 67 insertions, 0 deletions

diff --git a/src/StringFormat.cc b/src/StringFormat.cc
new file mode 100644
index 00000000..2dadc0ac
--- /dev/null
+++ b/src/StringFormat.cc
@@ -0,0 +1,67 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2006 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "StringFormat.h"
+#include <ostream>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <cstdlib>
+
+namespace aria2 {
+
+StringFormat::StringFormat(const char* fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  char* strp;
+  if(vasprintf(&strp, fmt, ap) != -1) {
+    _msg.assign(&strp[0], &strp[strlen(strp)]);
+    free(strp);
+  }
+  va_end(ap);
+}
+
+const std::string& StringFormat::toString() const
+{
+  return _msg;
+}
+
+std::ostream& operator<<(std::ostream& o, const StringFormat& fmt)
+{
+  o << fmt.toString();
+  return o;
+}
+
+} // namespace aria2