From 1328d62f9d3a2eb9f089d531614302005c29ec37 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 21 Jun 2015 21:56:59 +0200
Subject: Replace MGMT socket by ZMQ, make services shared_ptr

---
 src/utils.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/utils.cpp')

diff --git a/src/utils.cpp b/src/utils.cpp
index 50591ae..42937c1 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -366,28 +366,27 @@ void printOutputs(vector<boost::shared_ptr<DabOutput> >& outputs)
     }
 }
 
-void printServices(vector<DabService*>& services)
+void printServices(const vector<shared_ptr<DabService> >& services)
 {
-    vector<DabService*>::const_iterator current;
     int index = 0;
 
-    for (current = services.begin(); current != services.end(); ++current) {
+    for (auto service : services) {
 
-        etiLog.level(info) << "Service       " << (*current)->get_rc_name();
+        etiLog.level(info) << "Service       " << service->get_rc_name();
         etiLog.level(info) << " label:       " <<
-                (*current)->label.long_label();
+                service->label.long_label();
         etiLog.level(info) << " short label: " <<
-                (*current)->label.short_label();
+                service->label.short_label();
 
-        etiLog.log(info, " (0x%x)", (*current)->label.flag());
-        etiLog.log(info, " id:          0x%lx (%lu)", (*current)->id,
-                (*current)->id);
+        etiLog.log(info, " (0x%x)", service->label.flag());
+        etiLog.log(info, " id:          0x%lx (%lu)", service->id,
+                service->id);
 
-        etiLog.log(info, " pty:         0x%x (%u)", (*current)->pty,
-                (*current)->pty);
+        etiLog.log(info, " pty:         0x%x (%u)", service->pty,
+                service->pty);
 
         etiLog.log(info, " language:    0x%x (%u)",
-                (*current)->language, (*current)->language);
+                service->language, service->language);
         ++index;
     }
 }
-- 
cgit v1.2.3