Verified Commit 31e77109 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Fix return for ADM_update_adhoc_storage()

parent ccebb6b0

examples/cxx/ADM_update_adhoc_storage.cpp

+3 −10
Original line number Diff line number Diff line
@@ -63,22 +63,15 @@ main(int argc, char* argv[]) { 
                server, name, admire::storage::type::gekkofs,

                adhoc_storage_ctx);



        const auto ret = admire::update_adhoc_storage(server, adhoc_storage,

        admire::update_adhoc_storage(server, adhoc_storage,

                                     new_adhoc_storage_ctx);



        if(!ret) {

            fmt::print(stderr, "FATAL: ADM_update_adhoc_storage() failed: {}\n",

                       ret.message());

            exit(EXIT_FAILURE);

        }



        fmt::print(stdout,

                   "ADM_update_adhoc_storage() remote procedure completed "

                   "successfully\n");

        exit(EXIT_SUCCESS);

    } catch(const std::exception& e) {

        fmt::print(stderr, "FATAL: ADM_register_adhoc_storage() failed: {}\n",

                   e.what());

        fmt::print(stderr, "FATAL: example failed: {}\n", e.what());

        exit(EXIT_FAILURE);

    }

}

src/lib/admire.cpp

+8 −2
Original line number Diff line number Diff line
@@ -260,10 +260,16 @@ register_adhoc_storage(const server& srv, const std::string& name, 
    return rv.value();

}



admire::error_code

void

update_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage,

                     const adhoc_storage::ctx& adhoc_storage_ctx) {

    return detail::update_adhoc_storage(srv, adhoc_storage_ctx, adhoc_storage);

    const auto ec =

            detail::update_adhoc_storage(srv, adhoc_storage_ctx, adhoc_storage);



    if(!ec) {

        throw std::runtime_error(fmt::format(

                "ADM_update_adhoc_storage() error: {}", ec.message()));

    }

}



admire::error_code

src/lib/admire.hpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ register_adhoc_storage(const server& srv, const std::string& name, 
                       enum adhoc_storage::type type,

                       const adhoc_storage::ctx& ctx);



admire::error_code

void

update_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage,

                     const adhoc_storage::ctx& adhoc_storage_ctx);