Commit e253e582 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch 'amiranda/95-arguments-for-adm_update_adhoc_storage-should-be-swapped' into 'main' 

Resolve "Arguments for `ADM_update_adhoc_storage` should be swapped"

Closes #95

See merge request !65
parents 88d5862a 61883619

examples/c/ADM_update_adhoc_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ main(int argc, char* argv[]) { 
    }



    // We can now request the update to the server

    if((ret = ADM_update_adhoc_storage(server, new_adhoc_ctx, adhoc_storage)) !=

    if((ret = ADM_update_adhoc_storage(server, adhoc_storage, new_adhoc_ctx)) !=

       ADM_SUCCESS) {

        fprintf(stderr, "ADM_update_adhoc_storage() failed: %s\n",

                ADM_strerror(ret));

examples/cxx/ADM_update_adhoc_storage.cpp

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

                adhoc_storage_ctx);



        const auto ret = admire::update_adhoc_storage(

                server, new_adhoc_storage_ctx, adhoc_storage);

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

                                                      new_adhoc_storage_ctx);



        if(!ret) {

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

src/lib/admire.cpp

+2 −3
Original line number Diff line number Diff line
@@ -249,9 +249,8 @@ register_adhoc_storage(const server& srv, const std::string& name, 
}



admire::error_code

update_adhoc_storage(const server& srv,

                     const adhoc_storage::ctx& adhoc_storage_ctx,

                     const adhoc_storage& adhoc_storage) {

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);

}

src/lib/admire.h

+2 −2
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ ADM_register_adhoc_storage(ADM_server_t server, const char* name, 
 * successfully.

 */

ADM_return_t

ADM_update_adhoc_storage(ADM_server_t server, ADM_adhoc_context_t ctx,

                         ADM_storage_t adhoc_storage);

ADM_update_adhoc_storage(ADM_server_t server, ADM_storage_t adhoc_storage,

                         ADM_adhoc_context_t ctx);



/**

 * Remove an already-registered adhoc storage system.

src/lib/admire.hpp

+2 −3
Original line number Diff line number Diff line
@@ -63,9 +63,8 @@ register_adhoc_storage(const server& srv, const std::string& name, 
                       const adhoc_storage::ctx& ctx);



admire::error_code

update_adhoc_storage(const server& srv,

                     const adhoc_storage::ctx& adhoc_storage_ctx,

                     const adhoc_storage& adhoc_storage);

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

                     const adhoc_storage::ctx& adhoc_storage_ctx);



admire::error_code

remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage);