It is a bad idea to name your own variables "errno". On some system the libc defines...

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@294 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-client/client.c b/avahi-client/client.c
index 46b7b37ce271e2282d5e4a6994a50ec42e477d6f..49ace50c2a5a1f5d9b8aab1a0df9985166e00c54 100644 (file)
--- a/avahi-client/client.c
+++ b/avahi-client/client.c
@@ -41,13 +41,13 @@
 #include "internal.h"
 
 int
-avahi_client_set_errno (AvahiClient *client, int errno)
+avahi_client_set_errno (AvahiClient *client, int error)
 {
-    if (client == NULL) return errno;
+    if (client == NULL) return error;
 
-    client->errno = errno;
+    client->error = error;
 
-    return errno;
+    return error;
 }
     
 static

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index 6c0613f142b192e178804531da44166f0378110b..7e8f74ea0891106b8110bb4d040dd8bc399b6721 100644 (file)
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -181,7 +181,7 @@ avahi_entry_group_state (AvahiEntryGroup *group)
 int
 avahi_client_errno (AvahiClient *client)
 {
-    return client->errno;
+    return client->error;
 }
 
 AvahiClient*

diff --git a/avahi-client/internal.h b/avahi-client/internal.h
index 64ba919b92615ae92a7a03555b056ced015b5a92..ad39af3641d581584302e12da97abf1d271ca057 100644 (file)
--- a/avahi-client/internal.h
+++ b/avahi-client/internal.h
@@ -27,7 +27,7 @@
 struct _AvahiClient
 {
     DBusConnection *bus;
-    int errno;
+    int error;
     AvahiClientCallback callback;
     void *user_data;
     AVAHI_LLIST_HEAD(AvahiEntryGroup, groups);
@@ -59,7 +59,7 @@ struct _AvahiServiceTypeBrowser {
     AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, service_type_browsers);
 };
 
-int avahi_client_set_errno (AvahiClient *client, int errno);
+int avahi_client_set_errno (AvahiClient *client, int error);
 
 void avahi_entry_group_state_change (AvahiEntryGroup *group, int state);