From 0632e854728e8e64552ae08f90852d4a2658539e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Aug 2005 18:59:21 +0000
Subject: * add proper error codes and patch everything to make use of it *
 parameter validity checkin in all user visible functions of libavahi-core *
 two new python tools/examples avahi-resolve-host-name and
 avahi-resolve-address

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@238 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 examples/browse-services.c | 16 ++++++++++++++--
 examples/publish-service.c | 18 +++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/browse-services.c b/examples/browse-services.c
index bb8eed8..c58d230 100644
--- a/examples/browse-services.c
+++ b/examples/browse-services.c
@@ -77,6 +77,8 @@ int main(int argc, char*argv[]) {
     AvahiServerConfig config;
     AvahiServer *server = NULL;
     AvahiServiceBrowser *sb;
+    gint error;
+    int ret = 1;
 
     /* Do not publish any local records */
     avahi_server_config_init(&config);
@@ -86,11 +88,17 @@ int main(int argc, char*argv[]) {
     config.publish_domain = FALSE;
     
     /* Allocate a new server */
-    server = avahi_server_new(NULL, &config, NULL, NULL);
+    server = avahi_server_new(NULL, &config, NULL, NULL, &error);
 
     /* Free the configuration data */
     avahi_server_config_free(&config);
 
+    /* Check wether creating the server object succeeded */
+    if (!server) {
+        g_message("Failed to create server: %s", avahi_strerror(error));
+        goto fail;
+    }
+    
     /* Create the service browser */
     sb = avahi_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, browse_callback, server);
     
@@ -98,6 +106,10 @@ int main(int argc, char*argv[]) {
     main_loop = g_main_loop_new(NULL, FALSE);
     g_main_loop_run(main_loop);
 
+    ret = 0;
+    
+fail:
+    
     /* Cleanup things */
     if (sb)
         avahi_service_browser_free(sb);
@@ -108,5 +120,5 @@ int main(int argc, char*argv[]) {
     if (main_loop)
         g_main_loop_unref(main_loop);
 
-    return 0;
+    return ret;
 }
diff --git a/examples/publish-service.c b/examples/publish-service.c
index 7c9879c..a936147 100644
--- a/examples/publish-service.c
+++ b/examples/publish-service.c
@@ -121,7 +121,9 @@ static void server_callback(AvahiServer *s, AvahiServerState state, gpointer use
 int main(int argc, char*argv[]) {
     AvahiServerConfig config;
     AvahiServer *server = NULL;
-
+    gint error;
+    int ret = 1;
+    
     srand(time(NULL));
     
     name = g_strdup("MegaPrinter");
@@ -132,15 +134,25 @@ int main(int argc, char*argv[]) {
     config.publish_workstation = FALSE;
     
     /* Allocate a new server */
-    server = avahi_server_new(NULL, &config, server_callback, NULL);
+    server = avahi_server_new(NULL, &config, server_callback, NULL, &error);
 
     /* Free the configuration data */
     avahi_server_config_free(&config);
+
+    /* Check wether creating the server object succeeded */
+    if (!server) {
+        g_message("Failed to create server: %s", avahi_strerror(error));
+        goto fail;
+    }
     
     /* Run the main loop */
     main_loop = g_main_loop_new(NULL, FALSE);
     g_main_loop_run(main_loop);
 
+    ret = 0;
+    
+fail:
+    
     /* Cleanup things */
     if (group)
         avahi_entry_group_free(group);
@@ -153,5 +165,5 @@ int main(int argc, char*argv[]) {
 
     g_free(name);
     
-    return 0;
+    return ret;
 }
-- 
cgit