diff options
author | Thomas White <taw@physics.org> | 2021-07-23 17:10:11 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2022-06-02 12:15:38 +0200 |
commit | 8735bc06caf9ab07b13108f80763a6ff164f0db6 (patch) | |
tree | a65567048dae0e44a571ce50cbd471377b2c5693 /src/im-asapo.c | |
parent | c1a526cebf6e97d78ff340148952421feaaee9c3 (diff) |
ASAP::O: Tidy up build process
This removes a lot of random #ifdefs from the source code.
Diffstat (limited to 'src/im-asapo.c')
-rw-r--r-- | src/im-asapo.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/im-asapo.c b/src/im-asapo.c index 362a73b0..ea6505a4 100644 --- a/src/im-asapo.c +++ b/src/im-asapo.c @@ -60,16 +60,10 @@ static void show_asapo_error(const char *msg, const AsapoErrorHandle err) } -AsapoStringHandle im_asapo_group_id_from_string(const char *str) -{ - return asapo_string_from_c_str(str); -} - - -AsapoStringHandle im_asapo_make_unique_group_id(const char *endpoint, - const char *token, - const char *beamtime, - const char *path) +char *im_asapo_make_unique_group_id(const char *endpoint, + const char *token, + const char *beamtime, + const char *path) { AsapoConsumerHandle consumer; AsapoSourceCredentialsHandle cred; @@ -94,7 +88,7 @@ AsapoStringHandle im_asapo_make_unique_group_id(const char *endpoint, return NULL; } - return group_id; + return strdup(asapo_string_c_str(group_id)); } @@ -102,7 +96,7 @@ struct im_asapo *im_asapo_connect(const char *endpoint, const char *token, const char *beamtime, const char *path, - AsapoStringHandle group_id) + const char *group_id) { struct im_asapo *a; AsapoSourceCredentialsHandle cred; @@ -122,7 +116,7 @@ struct im_asapo *im_asapo_connect(const char *endpoint, asapo_consumer_set_timeout(a->consumer, 1000); - a->group_id = group_id; + a->group_id = asapo_string_from_c_str(group_id); return a; } |