summaryrefslogtreecommitdiffstats
path: root/avahi-core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-10-27 19:43:09 +0000
committerLennart Poettering <lennart@poettering.net>2005-10-27 19:43:09 +0000
commit21dd860429b6a3065118fdba4b298cdb19c28d15 (patch)
tree9f23dfdda7a20e5392a9b7cd72366d4e6d3cd7cf /avahi-core
parent2be7dc13cecbb995692eec1bfc1d27799651ec70 (diff)
remove a bunch of compiler warnings
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@898 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core')
-rw-r--r--avahi-core/announce.c6
-rw-r--r--avahi-core/server.c6
-rw-r--r--avahi-core/wide-area.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/avahi-core/announce.c b/avahi-core/announce.c
index 4fa73e2..061f104 100644
--- a/avahi-core/announce.c
+++ b/avahi-core/announce.c
@@ -206,7 +206,7 @@ static AvahiAnnouncer *get_announcer(AvahiServer *s, AvahiEntry *e, AvahiInterfa
return NULL;
}
-static void go_to_initial_state(AvahiAnnouncer *a, int immediately) {
+static void go_to_initial_state(AvahiAnnouncer *a) {
AvahiEntry *e;
struct timeval tv;
@@ -271,7 +271,7 @@ static void new_announcer(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
AVAHI_LLIST_PREPEND(AvahiAnnouncer, by_interface, i->announcers, a);
AVAHI_LLIST_PREPEND(AvahiAnnouncer, by_entry, e->announcers, a);
- go_to_initial_state(a, 0);
+ go_to_initial_state(a);
/* avahi_log_debug("New announcer on interface %s.%i for entry [%s] state=%i", i->hardware->name, i->protocol, t = avahi_record_to_string(e->record), a->state); */
/* avahi_free(t); */
@@ -369,7 +369,7 @@ void avahi_entry_return_to_initial_state(AvahiServer *s, AvahiEntry *e, AvahiInt
if (a->state == AVAHI_PROBING && a->entry->group)
a->entry->group->n_probing--;
- go_to_initial_state(a, 1);
+ go_to_initial_state(a);
}
static AvahiRecord *make_goodbye_record(AvahiRecord *r) {
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 700b3a8..0978385 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -236,7 +236,7 @@ static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *
}
}
-static int handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, int unique, const AvahiAddress *a) {
+static int handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, int unique) {
int valid = 1, ours = 0, conflict = 0, withdraw_immediately = 0;
AvahiEntry *e, *n, *conflicting_entry = NULL;
@@ -591,7 +591,7 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac
goto fail;
}
- if (handle_conflict(s, i, record, unique, a)) {
+ if (handle_conflict(s, i, record, unique)) {
avahi_response_scheduler_suppress(i->response_scheduler, record, a);
avahi_record_list_drop(s->record_list, record);
avahi_cache_stop_poof(i->cache, record, a);
@@ -655,7 +655,7 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter
/* avahi_log_debug("Handling response: %s", txt = avahi_record_to_string(record)); */
/* avahi_free(txt); */
- if (handle_conflict(s, i, record, cache_flush, a)) {
+ if (handle_conflict(s, i, record, cache_flush)) {
if (!from_local_iface)
reflect_response(s, i, record, cache_flush);
avahi_cache_update(i->cache, record, cache_flush, a);
diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index f191074..fdd35c0 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -478,7 +478,7 @@ static int map_dns_error(uint16_t error) {
return table[error];
}
-static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p, AvahiAddress *a) {
+static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p) {
AvahiWideAreaLookup *l = NULL;
int i, r;
@@ -571,7 +571,7 @@ static void socket_event(AVAHI_GCC_UNUSED AvahiWatch *w, int fd, AVAHI_GCC_UNUSE
}
if (p) {
- handle_packet(e, p, &a);
+ handle_packet(e, p);
avahi_dns_packet_free(p);
}
}