Switch to unified view

a/src/upmpdutils.cxx b/src/upmpdutils.cxx
...
...
212
    stringToTokens(protoinfo, toks, ":");
212
    stringToTokens(protoinfo, toks, ":");
213
    if (toks.size() != 4) {
213
    if (toks.size() != 4) {
214
        LOGDEB("protoInfToFormat: bad format: [" << protoinfo << "]\n");
214
        LOGDEB("protoInfToFormat: bad format: [" << protoinfo << "]\n");
215
        return string();
215
        return string();
216
    }
216
    }
217
    return toks[2];
217
    return stringtolower((const std::string&)toks[2]);
218
}
218
}
219
219
220
// This should be made an UPnPResource method one day
220
// This should be made an UPnPResource method one day
221
string resourceContentFormat(const UPnPResource& res)
221
string resourceContentFormat(const UPnPResource& res)
222
{
222
{
...
...
288
        LOGERR("upmpd: regsub1: regcomp() failed: " << errbuf << endl);
288
        LOGERR("upmpd: regsub1: regcomp() failed: " << errbuf << endl);
289
        return string();
289
        return string();
290
    }
290
    }
291
291
292
    if ((err = regexec(&expr, input.c_str(), 10, pmatch, 0))) {
292
    if ((err = regexec(&expr, input.c_str(), 10, pmatch, 0))) {
293
        regerror(err, &expr, errbuf, ERRSIZE);
293
        // regerror(err, &expr, errbuf, ERRSIZE);
294
        //LOGDEB("upmpd: regsub1: regexec(" << sexp << ") failed: "
294
        //LOGDEB("upmpd: regsub1: regexec(" << sexp << ") failed: "
295
        //    <<  errbuf << endl);
295
        //<<  errbuf << endl);
296
        regfree(&expr);
296
        regfree(&expr);
297
        return string();
297
        return input;
298
    }
298
    }
299
    if (pmatch[0].rm_so == -1) {
299
    if (pmatch[0].rm_so == -1) {
300
        // No match
300
        // No match
301
        regfree(&expr);
301
        regfree(&expr);
302
        return input;
302
        return input;