Skip to content

Commit fd3abe8

Browse files
authored
server: fixing naming conflict res_error in server-models.cpp (#17679)
1 parent 682e665 commit fd3abe8

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tools/server/server-models.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -642,26 +642,26 @@ static void res_ok(std::unique_ptr<server_http_res> & res, const json & response
642642
res->data = safe_json_to_str(response_data);
643643
}
644644

645-
static void res_error(std::unique_ptr<server_http_res> & res, const json & error_data) {
645+
static void res_err(std::unique_ptr<server_http_res> & res, const json & error_data) {
646646
res->status = json_value(error_data, "code", 500);
647647
res->data = safe_json_to_str({{ "error", error_data }});
648648
}
649649

650650
static bool router_validate_model(const std::string & name, server_models & models, bool models_autoload, std::unique_ptr<server_http_res> & res) {
651651
if (name.empty()) {
652-
res_error(res, format_error_response("model name is missing from the request", ERROR_TYPE_INVALID_REQUEST));
652+
res_err(res, format_error_response("model name is missing from the request", ERROR_TYPE_INVALID_REQUEST));
653653
return false;
654654
}
655655
auto meta = models.get_meta(name);
656656
if (!meta.has_value()) {
657-
res_error(res, format_error_response("model not found", ERROR_TYPE_INVALID_REQUEST));
657+
res_err(res, format_error_response("model not found", ERROR_TYPE_INVALID_REQUEST));
658658
return false;
659659
}
660660
if (models_autoload) {
661661
models.ensure_model_loaded(name);
662662
} else {
663663
if (meta->status != SERVER_MODEL_STATUS_LOADED) {
664-
res_error(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST));
664+
res_err(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST));
665665
return false;
666666
}
667667
}
@@ -761,11 +761,11 @@ void server_models_routes::init_routes() {
761761
std::string name = json_value(body, "model", std::string());
762762
auto model = models.get_meta(name);
763763
if (!model.has_value()) {
764-
res_error(res, format_error_response("model is not found", ERROR_TYPE_NOT_FOUND));
764+
res_err(res, format_error_response("model is not found", ERROR_TYPE_NOT_FOUND));
765765
return res;
766766
}
767767
if (model->status == SERVER_MODEL_STATUS_LOADED) {
768-
res_error(res, format_error_response("model is already loaded", ERROR_TYPE_INVALID_REQUEST));
768+
res_err(res, format_error_response("model is already loaded", ERROR_TYPE_INVALID_REQUEST));
769769
return res;
770770
}
771771
models.load(name, false);
@@ -823,11 +823,11 @@ void server_models_routes::init_routes() {
823823
std::string name = json_value(body, "model", std::string());
824824
auto model = models.get_meta(name);
825825
if (!model.has_value()) {
826-
res_error(res, format_error_response("model is not found", ERROR_TYPE_INVALID_REQUEST));
826+
res_err(res, format_error_response("model is not found", ERROR_TYPE_INVALID_REQUEST));
827827
return res;
828828
}
829829
if (model->status != SERVER_MODEL_STATUS_LOADED) {
830-
res_error(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST));
830+
res_err(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST));
831831
return res;
832832
}
833833
models.unload(name);

0 commit comments

Comments
 (0)