oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

*: let libfmt quote strings

Browse Source
This commit is contained in:
Max Kellermann
2024-04-16 11:06:34 +02:00
parent 39c9e92f42
commit 0c1ecc96a8
71 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/AllCommands.cxx
View File

@@ -320,7 +320,7 @@ command_check_request(const struct command *cmd, Response &r,
{
if (cmd->permission != (permission & cmd->permission)) {
r.FmtError(ACK_ERROR_PERMISSION,
FMT_STRING("you don't have permission for \"{}\""),
FMT_STRING("you don't have permission for {:?}"),
cmd->cmd);
return false;
}
@@ -333,17 +333,17 @@ command_check_request(const struct command *cmd, Response &r,
if (min == max && unsigned(max) != args.size()) {
r.FmtError(ACK_ERROR_ARG,
FMT_STRING("wrong number of arguments for \"{}\""),
FMT_STRING("wrong number of arguments for {:?}"),
cmd->cmd);
return false;
} else if (args.size() < unsigned(min)) {
r.FmtError(ACK_ERROR_ARG,
FMT_STRING("too few arguments for \"{}\""),
FMT_STRING("too few arguments for {:?}"),
cmd->cmd);
return false;
} else if (max >= 0 && args.size() > unsigned(max)) {
r.FmtError(ACK_ERROR_ARG,
FMT_STRING("too many arguments for \"{}\""),
FMT_STRING("too many arguments for {:?}"),
cmd->cmd);
return false;
} else
@@ -357,7 +357,7 @@ command_checked_lookup(Response &r, unsigned permission,
const struct command *cmd = command_lookup(cmd_name);
if (cmd == nullptr) {
r.FmtError(ACK_ERROR_UNKNOWN,
FMT_STRING("unknown command \"{}\""), cmd_name);
FMT_STRING("unknown command {:?}"), cmd_name);
return nullptr;
}

2
src/command/DatabaseCommands.cxx
View File

@@ -325,7 +325,7 @@ handle_list(Client &client, Request args, Response &r)
/* for compatibility with < 0.12.0 */
if (tagType != TAG_ALBUM) {
r.FmtError(ACK_ERROR_ARG,
FMT_STRING("should be \"{}\" for 3 arguments"),
FMT_STRING("should be {:?} for 3 arguments"),
tag_item_names[TAG_ALBUM]);
return CommandResult::ERROR;
}

20
src/command/StickerCommands.cxx
View File

@@ -38,7 +38,7 @@ public:
ValidateUri(uri).c_str(),
name);
if (value.empty()) {
response.FmtError(ACK_ERROR_NO_EXIST, "no such sticker: \"{}\"", name);
response.FmtError(ACK_ERROR_NO_EXIST, "no such sticker: {:?}", name);
return CommandResult::ERROR;
}
@@ -63,7 +63,7 @@ public:
? sticker_database.Delete(sticker_type, uri)
: sticker_database.DeleteValue(sticker_type, uri, name);
if (!ret) {
response.FmtError(ACK_ERROR_NO_EXIST, "no such sticker: \"{}\"", name);
response.FmtError(ACK_ERROR_NO_EXIST, "no such sticker: {:?}", name);
return CommandResult::ERROR;
}
@@ -247,13 +247,13 @@ public:
protected:
std::string ValidateUri(const char *uri) override {
if (tag_type == TAG_NUM_OF_ITEM_TYPES)
throw std::invalid_argument(fmt::format("no such tag: \"{}\"", sticker_type));
throw std::invalid_argument(fmt::format("no such tag: {:?}", sticker_type));
if (!sticker_allowed_tags.Test(tag_type))
throw std::invalid_argument(fmt::format("unsupported tag: \"{}\"", sticker_type));
throw std::invalid_argument(fmt::format("unsupported tag: {:?}", sticker_type));
if (!TagExists(database, tag_type, uri))
throw std::invalid_argument(fmt::format("no such {}: \"{}\"", sticker_type, uri));
throw std::invalid_argument(fmt::format("no such {}: {:?}", sticker_type, uri));
return {uri};
}
@@ -283,7 +283,7 @@ protected:
auto normalized = filter.ToExpression();
if (!FilterMatches(database, filter))
throw std::invalid_argument(fmt::format("no matches found: \"{}\"", normalized));
throw std::invalid_argument(fmt::format("no matches found: {:?}", normalized));
return normalized;
}
@@ -306,7 +306,7 @@ private:
const ScopeDatabaseLock protect;
if (!playlists.exists(uri))
throw std::invalid_argument(fmt::format("no such playlist: \"{}\"", uri));
throw std::invalid_argument(fmt::format("no such playlist: {:?}", uri));
return {uri};
}
@@ -369,7 +369,7 @@ handle_sticker(Client &client, Request args, Response &r)
handler = std::make_unique<TagHandler>(r, db, sticker_database, tag_type);
else {
r.FmtError(ACK_ERROR_ARG, "unknown sticker domain \"{}\"", sticker_type);
r.FmtError(ACK_ERROR_ARG, "unknown sticker domain {:?}", sticker_type);
return CommandResult::ERROR;
}
@@ -413,7 +413,7 @@ handle_sticker(Client &client, Request args, Response &r)
sort = s;
}
else {
r.FmtError(ACK_ERROR_ARG, "Unknown sort tag \"{}\"", s);
r.FmtError(ACK_ERROR_ARG, "Unknown sort tag {:?}", s);
return CommandResult::ERROR;
}
@@ -444,7 +444,7 @@ handle_sticker(Client &client, Request args, Response &r)
else if (StringIsEqual(op_s, "starts_with"))
op = StickerOperator::STARTS_WITH;
else {
r.FmtError(ACK_ERROR_ARG, "bad operator \"{}\"", op_s);
r.FmtError(ACK_ERROR_ARG, "bad operator {:?}", op_s);
return CommandResult::ERROR;
}
}