tags 444235 patch
found 444235 0.6.21-2
thanks
avahi-received.patch:
"Recieved" should also be "'I' before 'E' except after 'C'" (despite the
many exceptions to that rule[1]).
avahi-an_utf-8.patch:
I also suggest "a UTF-8" is preferable over "an UTF8" because it's
pronounced with a 'y' sound. (This patch should apply after the other.)
[1] http://web.midg3t.net/blog/109/i-before-e/
[2] http://en.wiktionary.org/wiki/an#Article
--
\0
pedant (noun):
A person who is overly concerned with formal rules and trivial
points of learning.
- http://en.wiktionary.org/wiki/pedant
diff -ru avahi-0.6.21-new/avahi-core/server.c avahi-0.6.21-new2/avahi-core/server.c
--- avahi-0.6.21-new/avahi-core/server.c 2007-09-27 17:17:13.000000000 +1000
+++ avahi-0.6.21-new2/avahi-core/server.c 2007-09-27 17:19:57.000000000 +1000
@@ -579,7 +579,7 @@
int unicast_response = 0;
if (!(key = avahi_dns_packet_consume_key(p, &unicast_response))) {
- avahi_log_warn(__FILE__": Packet too short or invalid while reading question key. (Maybe an UTF8 problem?)");
+ avahi_log_warn(__FILE__": Packet too short or invalid while reading question key. (Maybe a UTF-8 problem?)");
goto fail;
}
@@ -606,7 +606,7 @@
int unique = 0;
if (!(record = avahi_dns_packet_consume_record(p, &unique))) {
- avahi_log_warn(__FILE__": Packet too short or invalid while reading known answer record. (Maybe an UTF8 problem?)");
+ avahi_log_warn(__FILE__": Packet too short or invalid while reading known answer record. (Maybe a UTF-8 problem?)");
goto fail;
}
@@ -623,7 +623,7 @@
int unique = 0;
if (!(record = avahi_dns_packet_consume_record(p, &unique))) {
- avahi_log_warn(__FILE__": Packet too short or invalid while reading probe record. (Maybe an UTF8 problem?)");
+ avahi_log_warn(__FILE__": Packet too short or invalid while reading probe record. (Maybe a UTF-8 problem?)");
goto fail;
}
@@ -661,7 +661,7 @@
/* char *txt; */
if (!(record = avahi_dns_packet_consume_record(p, &cache_flush))) {
- avahi_log_warn(__FILE__": Packet too short or invalid while reading response record. (Maybe an UTF8 problem?)");
+ avahi_log_warn(__FILE__": Packet too short or invalid while reading response record. (Maybe a UTF-8 problem?)");
break;
}
diff -ru avahi-0.6.21/avahi-core/server.c avahi-0.6.21-new/avahi-core/server.c
--- avahi-0.6.21/avahi-core/server.c 2007-08-13 01:45:34.000000000 +1000
+++ avahi-0.6.21-new/avahi-core/server.c 2007-09-27 17:17:13.000000000 +1000
@@ -228,9 +228,9 @@
char *t = avahi_record_to_string(record);
if (won)
- avahi_log_debug("Recieved conflicting probe [%s]. Local host won.", t);
+ avahi_log_debug("Received conflicting probe [%s]. Local host won.", t);
else if (lost) {
- avahi_log_debug("Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t);
+ avahi_log_debug("Received conflicting probe [%s]. Local host lost. Withdrawing.", t);
withdraw_rrset(s, record->key);
}
@@ -262,7 +262,7 @@
/* Refresh */
t = avahi_record_to_string(record);
- avahi_log_debug("Recieved goodbye record for one of our records [%s]. Refreshing.", t);
+ avahi_log_debug("Received goodbye record for one of our records [%s]. Refreshing.", t);
avahi_server_prepare_matching_responses(s, i, e->record->key, 0);
valid = 0;
@@ -289,7 +289,7 @@
/* Refresh */
t = avahi_record_to_string(record);
- avahi_log_debug("Recieved record with bad TTL [%s]. Refreshing.", t);
+ avahi_log_debug("Received record with bad TTL [%s]. Refreshing.", t);
avahi_server_prepare_matching_responses(s, i, e->record->key, 0);
valid = 0;
@@ -326,11 +326,11 @@
t = avahi_record_to_string(record);
if (withdraw_immediately) {
- avahi_log_debug("Recieved conflicting record [%s] with local record to be. Withdrawing.", t);
+ avahi_log_debug("Received conflicting record [%s] with local record to be. Withdrawing.", t);
withdraw_rrset(s, record->key);
} else {
assert(conflicting_entry);
- avahi_log_debug("Recieved conflicting record [%s]. Resetting our record.", t);
+ avahi_log_debug("Received conflicting record [%s]. Resetting our record.", t);
avahi_entry_return_to_initial_state(s, conflicting_entry, i);
/* Local unique records are returned to probing
@@ -893,7 +893,7 @@
if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, src_address->proto)) ||
!i->announcing) {
- avahi_log_warn("Recieved packet from invalid interface.");
+ avahi_log_warn("Received packet from invalid interface.");
return;
}
@@ -910,7 +910,7 @@
from_local_iface = originates_from_local_iface(s, iface, src_address, port);
if (avahi_dns_packet_check_valid_multicast(p) < 0) {
- avahi_log_warn("Recieved invalid packet.");
+ avahi_log_warn("Received invalid packet.");
return;
}
@@ -941,12 +941,12 @@
} else {
if (port != AVAHI_MDNS_PORT) {
- avahi_log_warn("Recieved repsonse with invalid source port %u on interface '%s.%i'", port, i->hardware->name, i->protocol);
+ avahi_log_warn("Received response with invalid source port %u on interface '%s.%i'", port, i->hardware->name, i->protocol);
return;
}
if (ttl != 255 && s->config.check_response_ttl) {
- avahi_log_warn("Recieved response with invalid TTL %u on interface '%s.%i'.", ttl, i->hardware->name, i->protocol);
+ avahi_log_warn("Received response with invalid TTL %u on interface '%s.%i'.", ttl, i->hardware->name, i->protocol);
return;
}
@@ -975,12 +975,12 @@
assert(p);
if (avahi_dns_packet_check_valid(p) < 0 || avahi_dns_packet_is_query(p)) {
- avahi_log_warn("Recieved invalid packet.");
+ avahi_log_warn("Received invalid packet.");
return;
}
if (!(slot = find_slot(s, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID)))) {
- avahi_log_warn("Recieved legacy unicast response with unknown id");
+ avahi_log_warn("Received legacy unicast response with unknown id");
return;
}
