Commit 1f9e7c04 authored by Fawzi Mohamed's avatar Fawzi Mohamed Committed by Friedemann Kleint
Browse files

zeroconf/mdnssd: remove non ascii characters



Change-Id: Ice87a0c6cc64a7b063a3fce5b1b45bada10f220c
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 1c4d9e48
......@@ -198,7 +198,7 @@ mDNSexport char *GetRRDisplayString_rdb(const ResourceRecord *const rr, const RD
const mDNSu8 *t = rd->txt.c;
while (t < rd->txt.c + rr->rdlength)
{
length += mDNS_snprintf(buffer+length, RemSpc, "%s%#s", t > rd->txt.c ? "¦" : "", t);
length += mDNS_snprintf(buffer+length, RemSpc, "%s%#s", t > rd->txt.c ? "|" : "", t);
t += 1 + t[0];
}
} break;
......@@ -2984,7 +2984,7 @@ mDNSexport mDNSu32 mDNS_vsnprintf(char *sbuffer, mDNSu32 buflen, const char *fmt
}
}
if (F.altForm && !F.precision)
i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "«ZERO ADDRESS»");
i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "<ZERO ADDRESS>");
else switch (F.precision)
{
case 4: i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "%d.%d.%d.%d",
......
......@@ -21,7 +21,7 @@
*/
#if __APPLE__
// In Mac OS X 10.5 and later trying to use the daemon function gives a “‘daemon is deprecated
// In Mac OS X 10.5 and later trying to use the daemon function gives a "'daemon' is deprecated"
// error, which prevents compilation because we build with "-Werror".
// Since this is supposed to be portable cross-platform code, we don't care that daemon is
// deprecated on Mac OS X 10.5, so we use this preprocessor trick to eliminate the error message.
......
......@@ -10788,7 +10788,7 @@ mDNSexport void mDNS_ConfigChanged(mDNS *const m)
ConstructSleepProxyServerName(m, &newname);
if (!SameDomainLabelCS(name.c, newname.c))
{
LogSPS("Renaming SPS from %#s to %#s", name.c, newname.c);
LogSPS("Renaming SPS from '%#s' to '%#s'", name.c, newname.c);
// When SleepProxyServerCallback gets the mStatus_MemFree message,
// it will reregister the service under the new name
m->SPSState = 2;
......
......@@ -1668,7 +1668,7 @@ mDNSlocal mStatus handle_regservice_request(request_state *request)
if (!ConstructServiceName(&srv, &request->u.servicereg.name, &request->u.servicereg.type, &d))
{
LogMsg("ERROR: handle_regservice_request - Couldn't ConstructServiceName from, %#s” “%##s” “%##s",
LogMsg("ERROR: handle_regservice_request - Couldn't ConstructServiceName from, '%#s' '%##s' '%##s'",
request->u.servicereg.name.c, request->u.servicereg.type.c, d.c); return(mStatus_BadParamErr);
}
......@@ -2282,7 +2282,7 @@ mDNSlocal mStatus handle_resolve_request(request_state *request)
if (!request->msgptr) { LogMsg("%3d: DNSServiceResolve(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
if (build_domainname_from_strings(&fqdn, name, regtype, domain) < 0)
{ LogMsg("ERROR: handle_resolve_request bad %s” “%s” “%s", name, regtype, domain); return(mStatus_BadParamErr); }
{ LogMsg("ERROR: handle_resolve_request bad '%s' '%s' '%s'", name, regtype, domain); return(mStatus_BadParamErr); }
mDNSPlatformMemZero(&request->u.resolve, sizeof(request->u.resolve));
......@@ -3669,12 +3669,12 @@ mDNSlocal void read_msg(request_state *req)
{
#if !defined(USE_TCP_LOOPBACK)
struct stat sb;
LogMsg("%3d: read_msg: Couldn't connect to error return path socket %s errno %d (%s)",
LogMsg("%3d: read_msg: Couldn't connect to error return path socket '%s' errno %d (%s)",
req->sd, cliaddr.sun_path, dnssd_errno, dnssd_strerror(dnssd_errno));
if (stat(cliaddr.sun_path, &sb) < 0)
LogMsg("%3d: read_msg: stat failed %s errno %d (%s)", req->sd, cliaddr.sun_path, dnssd_errno, dnssd_strerror(dnssd_errno));
LogMsg("%3d: read_msg: stat failed '%s' errno %d (%s)", req->sd, cliaddr.sun_path, dnssd_errno, dnssd_strerror(dnssd_errno));
else
LogMsg("%3d: read_msg: file %s mode %o (octal) uid %d gid %d", req->sd, cliaddr.sun_path, sb.st_mode, sb.st_uid, sb.st_gid);
LogMsg("%3d: read_msg: file '%s' mode %o (octal) uid %d gid %d", req->sd, cliaddr.sun_path, sb.st_mode, sb.st_uid, sb.st_gid);
#endif
req->ts = t_error;
return;
......@@ -4448,7 +4448,7 @@ mDNSexport void udsserver_info(mDNS *const m)
else LogMsgNoIdent("Offering Sleep Proxy Service: %#s", m->SPSRecords.RR_SRV.resrec.name->c);
if (m->ProxyRecords == ProxyA + ProxyD) LogMsgNoIdent("ProxyRecords: %d + %d = %d", ProxyA, ProxyD, ProxyA + ProxyD);
else LogMsgNoIdent("ProxyRecords: MISMATCH %d + %d = %d %d", ProxyA, ProxyD, ProxyA + ProxyD, m->ProxyRecords);
else LogMsgNoIdent("ProxyRecords: MISMATCH %d + %d = %d != %d", ProxyA, ProxyD, ProxyA + ProxyD, m->ProxyRecords);
LogMsgNoIdent("------ Auto Browse Domains -----");
if (!AutoBrowseDomains) LogMsgNoIdent("<None>");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment