Fixes #82 -- simplifying header printing.

deanberris · deanberris · commit b46df4ed40fc · 2011-12-05T18:24:07.000+11:00
diff --git a/libs/network/example/http_client.cpp b/libs/network/example/http_client.cpp
@@ -11,30 +11,21 @@
 */
 #include <boost/program_options.hpp>
 #include <boost/network/protocol/http.hpp>
-#include <boost/function_output_iterator.hpp>
 #include <string>
+#include <utility>
 #include <iostream>
 
 namespace po = boost::program_options;
-using namespace std;
-
-struct header_printer {
-    std::ostream & os;
-    header_printer(std::ostream & os_) : os(os_) {}
-    template <class Pair>
-    void operator()(Pair const & p) {
-        os << p.first << ": " << p.second << endl;
-    }
-};
 
 int main(int argc, char * argv[]) {
+    using namespace boost::network;
     po::options_description options("Allowed options");
-    string output_filename, source;
+    std::string output_filename, source;
     bool show_headers;
     options.add_options()
         ("help,h", "produce help message")
         ("headers,H", "print headers")
-        ("source,s", po::value<string>(&source), "source URL")
+        ("source,s", po::value<std::string>(&source), "source URL")
         ;
 
     po::positional_options_description positional_options;
@@ -44,47 +35,47 @@ int main(int argc, char * argv[]) {
         po::store(po::command_line_parser(argc, argv).options(options).positional(positional_options).run(),
             vm);
         po::notify(vm);
-    } catch(exception & e) {
-        cout << "Error: " << e.what() << endl;
-        cout << options << endl;
+    } catch(std::exception & e) {
+        std::cout << "Error: " << e.what() << std::endl;
+        std::cout << options << std::endl;
         return EXIT_FAILURE;
     };
 
     if (vm.count("help")) {
-        cout << options << endl;
+        std::cout << options << std::endl;
         return EXIT_SUCCESS;
     };
 
     if (vm.count("source") < 1) {
-        cout << "Error: Source URL required." << endl;
-        cout << options << endl;
+        std::cout << "Error: Source URL required." << std::endl;
+        std::cout << options << std::endl;
         return EXIT_FAILURE;
     };
 
     show_headers = vm.count("headers") ? true : false ;
 
-    using namespace boost::network;
 
     typedef http::basic_client<http::tags::http_async_8bit_tcp_resolve, 1, 0>
         http_client;
-    
+
     http_client::request request(source);
     http_client::string_type destination_ = host(request);
-    
+
     request << ::boost::network::header("Connection", "close");
     http_client client(http::_follow_redirects=true);
     http_client::response response = client.get(request);
 
     if (show_headers) {
         headers_range<http_client::response>::type headers_ = response.headers();
-        std::copy(headers_.begin(), headers_.end(),
-            boost::make_function_output_iterator(header_printer(cout)));
-        cout << endl;
+        typedef std::pair<std::string, std::string> header_type;
+        BOOST_FOREACH(header_type const & header, headers_) {
+          std::cout << header.first << ": " << header.second << std::endl;
+        }
+        std::cout << std::endl;
     };
-    
+
     body_range<http_client::response>::type body_ = body(response).range();
-    boost::copy(body_, std::ostream_iterator<char_<http_client::request::tag>::type>(cout));
-    
+    boost::copy(body_, std::ostream_iterator<char_<http_client::request::tag>::type>(std::cout));
     return EXIT_SUCCESS;
 }
 //]
