summaryrefslogtreecommitdiffstats
path: root/avahi-core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-07-27 23:13:52 +0000
committerLennart Poettering <lennart@poettering.net>2005-07-27 23:13:52 +0000
commit8f1c6544deb351d9df51114c7f6e5f25e026f73e (patch)
tree7e9ac72d26081cbea2a5388f4e3163aac492fd86 /avahi-core
parentf4818ac7386bf29a5b8eeebaa6938b6b4ab2132f (diff)
* swap order of "type" and "name" arguments of avahi_server_add_service() and friends
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@179 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core')
-rw-r--r--avahi-core/avahi-test.c6
-rw-r--r--avahi-core/conformance-test.c2
-rw-r--r--avahi-core/core.h6
-rw-r--r--avahi-core/iface.c2
-rw-r--r--avahi-core/server.c10
5 files changed, 13 insertions, 13 deletions
diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 61d3ea1..669ca5b 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -115,17 +115,17 @@ static void create_entries(gboolean new_name) {
service_name = n;
}
- if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", service_name, NULL, NULL, 80, "foo", NULL) < 0) {
+ if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service_name, "_http._tcp", NULL, NULL, 80, "foo", NULL) < 0) {
avahi_log_error("Failed to add HTTP service");
goto fail;
}
- if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_ftp._tcp", service_name, NULL, NULL, 21, "foo", NULL) < 0) {
+ if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service_name, "_ftp._tcp", NULL, NULL, 21, "foo", NULL) < 0) {
avahi_log_error("Failed to add FTP service");
goto fail;
}
- if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_webdav._tcp", service_name, NULL, NULL, 80, "foo", NULL) < 0) {
+ if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service_name, "_webdav._tcp", NULL, NULL, 80, "foo", NULL) < 0) {
avahi_log_error("Failed to add WEBDAV service");
goto fail;
}
diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 688daba..e830982 100644
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -62,7 +62,7 @@ static void create_service(gchar *t) {
sleep(2); /* ugly ugly ugly hack */
group = avahi_entry_group_new(avahi, entry_group_callback, NULL);
- avahi_server_add_service(avahi, group, 0, AF_UNSPEC, "_http._tcp", name, NULL, NULL, 80, "foo", NULL);
+ avahi_server_add_service(avahi, group, 0, AF_UNSPEC, name, "_http._tcp", NULL, NULL, 80, "foo", NULL);
avahi_entry_group_commit(group);
try++;
diff --git a/avahi-core/core.h b/avahi-core/core.h
index e7e6268..a41aee6 100644
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -280,8 +280,8 @@ gint avahi_server_add_service(
AvahiEntryGroup *g,
AvahiIfIndex interface,
AvahiProtocol protocol,
- const gchar *type, /**< DNS-SD type, e.g. "_http._tcp" */
const gchar *name, /**< Service name, e.g. "Lennart's Files" */
+ const gchar *type, /**< DNS-SD type, e.g. "_http._tcp" */
const gchar *domain,
const gchar *host, /**< Host name where this servcie resides, or NULL if on the local host */
guint16 port, /**< Port number of the service */
@@ -293,8 +293,8 @@ gint avahi_server_add_service_va(
AvahiEntryGroup *g,
AvahiIfIndex interface,
AvahiProtocol protocol,
- const gchar *type,
const gchar *name,
+ const gchar *type,
const gchar *domain,
const gchar *host,
guint16 port,
@@ -306,8 +306,8 @@ gint avahi_server_add_service_strlst(
AvahiEntryGroup *g,
AvahiIfIndex interface,
AvahiProtocol protocol,
- const gchar *type,
const gchar *name,
+ const gchar *type,
const gchar *domain,
const gchar *host,
guint16 port,
diff --git a/avahi-core/iface.c b/avahi-core/iface.c
index a4c7de8..070ef6a 100644
--- a/avahi-core/iface.c
+++ b/avahi-core/iface.c
@@ -102,7 +102,7 @@ static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *h
g_free(t);
hw->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL);
- if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, "_workstation._tcp", name, NULL, NULL, 9, NULL) < 0) {
+ if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, name, "_workstation._tcp", NULL, NULL, 9, NULL) < 0) {
avahi_log_warn(__FILE__": avahi_server_add_service() failed.");
avahi_entry_group_free(hw->entry_group);
hw->entry_group = NULL;
diff --git a/avahi-core/server.c b/avahi-core/server.c
index b3ae039..9619ab4 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1709,8 +1709,8 @@ gint avahi_server_add_service_strlst(
AvahiEntryGroup *g,
gint interface,
guchar protocol,
- const gchar *type,
const gchar *name,
+ const gchar *type,
const gchar *domain,
const gchar *host,
guint16 port,
@@ -1761,8 +1761,8 @@ gint avahi_server_add_service_va(
AvahiEntryGroup *g,
gint interface,
guchar protocol,
- const gchar *type,
const gchar *name,
+ const gchar *type,
const gchar *domain,
const gchar *host,
guint16 port,
@@ -1772,7 +1772,7 @@ gint avahi_server_add_service_va(
g_assert(type);
g_assert(name);
- return avahi_server_add_service_strlst(s, g, interface, protocol, type, name, domain, host, port, avahi_string_list_new_va(va));
+ return avahi_server_add_service_strlst(s, g, interface, protocol, name, type, domain, host, port, avahi_string_list_new_va(va));
}
gint avahi_server_add_service(
@@ -1780,8 +1780,8 @@ gint avahi_server_add_service(
AvahiEntryGroup *g,
gint interface,
guchar protocol,
- const gchar *type,
const gchar *name,
+ const gchar *type,
const gchar *domain,
const gchar *host,
guint16 port,
@@ -1795,7 +1795,7 @@ gint avahi_server_add_service(
g_assert(name);
va_start(va, port);
- ret = avahi_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
+ ret = avahi_server_add_service_va(s, g, interface, protocol, name, type, domain, host, port, va);
va_end(va);
return ret;
}