[Libreoffice-commits] core.git: sd/source

Tor Lillqvist tml at collabora.com
Mon Jan 20 22:36:48 PST 2014


 sd/source/ui/remotecontrol/AvahiNetworkService.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d67c311983c4a7390fa9a11e1ca737756e0382fb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 20 21:46:33 2014 +0200

    Use SAL_INFO consistently, bin a random printf
    
    Change-Id: I2c7a0d4c3c2714bd1e2773c0749edd20ee38628f

diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 04d8e57..5b5fadf 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -46,7 +46,7 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
     switch (state) {
         case AVAHI_ENTRY_GROUP_ESTABLISHED :
             /* The entry group has been established successfully */
-            SAL_INFO( "sdremote.wifi", "Service " << avahiService->getName() << " successfully established." );
+            SAL_INFO( "sdremote.wifi", "Service '" << avahiService->getName() << "' successfully established." );
             break;
 
         case AVAHI_ENTRY_GROUP_COLLISION : {
@@ -57,7 +57,7 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
             n = avahi_alternative_service_name(avahiService->getName().c_str());
             avahiService->setName(n);
 
-            SAL_INFO( "sdremote.wifi", "Service name collision, renaming service to " << avahiService->getName() );
+            SAL_INFO( "sdremote.wifi", "Service name collision, renaming service to '" << avahiService->getName() << "'");
 
             /* And recreate the services */
             create_services(avahi_entry_group_get_client(g));
@@ -94,7 +94,7 @@ static void create_services(AvahiClient *c) {
      * because it was reset previously, add our entries.  */
 
     if (avahi_entry_group_is_empty(group)) {
-        fprintf(stderr, "Adding service '%s'\n", avahiService->getName().c_str());
+        SAL_INFO("sdremote.wifi", "Adding service '" << avahiService->getName() << "'");
         char r[128];
         snprintf(r, sizeof(r), "random=%i", rand());
         int ret = avahi_entry_group_add_service(


More information about the Libreoffice-commits mailing list