From: Jeroen van der Heijden Date: Tue, 30 Mar 2021 09:02:48 +0000 (+0200) Subject: replaced _Bool with bool X-Git-Tag: archive/raspbian/2.0.44-1+rpi1^2~3^2^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5bb460bc4ee151ae07be49dc9a26414757cc9cdd;p=siridb-server.git replaced _Bool with bool --- diff --git a/include/siri/api.h b/include/siri/api.h index cad41e58..19b1ed2c 100644 --- a/include/siri/api.h +++ b/include/siri/api.h @@ -5,9 +5,10 @@ #define SIRI_API_H_ #include -#include #include #include +#include +#include typedef enum { @@ -63,7 +64,7 @@ struct siri_api_request_s siri_api_content_t content_type; siri_api_req_t request_type; service_request_t service_type; - _Bool service_authenticated; + bool service_authenticated; http_parser parser; uv_write_t req; }; diff --git a/include/siri/db/buffer.h b/include/siri/db/buffer.h index ce791d31..f69f3110 100644 --- a/include/siri/db/buffer.h +++ b/include/siri/db/buffer.h @@ -10,13 +10,14 @@ typedef struct siridb_buffer_s siridb_buffer_t; #include #include #include +#include #define MAX_BUFFER_SZ 1048576 siridb_buffer_t * siridb_buffer_new(void); void siridb_buffer_free(siridb_buffer_t * buffer); void siridb_buffer_close(siridb_buffer_t * buffer); -_Bool siridb_buffer_is_valid_size(ssize_t ssize); +bool siridb_buffer_is_valid_size(ssize_t ssize); void siridb_buffer_set_path(siridb_buffer_t * buffer, const char * str); int siridb_buffer_new_series( siridb_buffer_t * buffer, diff --git a/include/siri/db/tee.h b/include/siri/db/tee.h index 6317120c..16ff3f38 100644 --- a/include/siri/db/tee.h +++ b/include/siri/db/tee.h @@ -24,9 +24,9 @@ int siridb_tee_connect(siridb_tee_t * tee); int siridb_tee_set_pipe_name(siridb_tee_t * tee, const char * pipe_name); void siridb_tee_write(siridb_tee_t * tee, sirinet_promise_t * promise); const char * tee_str(siridb_tee_t * tee); -static inline _Bool siridb_tee_is_configured(siridb_tee_t * tee); -static inline _Bool siridb_tee_is_connected(siridb_tee_t * tee); -static inline _Bool siridb_tee_is_handle(uv_handle_t * handle); +static inline bool siridb_tee_is_configured(siridb_tee_t * tee); +static inline bool siridb_tee_is_connected(siridb_tee_t * tee); +static inline bool siridb_tee_is_handle(uv_handle_t * handle); struct siridb_tee_s { @@ -36,17 +36,17 @@ struct siridb_tee_s uv_pipe_t pipe; }; -static inline _Bool siridb_tee_is_configured(siridb_tee_t * tee) +static inline bool siridb_tee_is_configured(siridb_tee_t * tee) { return tee->pipe_name_ != NULL; }; -static inline _Bool siridb_tee_is_connected(siridb_tee_t * tee) +static inline bool siridb_tee_is_connected(siridb_tee_t * tee) { return tee->flags & SIRIDB_TEE_FLAG_CONNECTED; } -static inline _Bool siridb_tee_is_handle(uv_handle_t * handle) +static inline bool siridb_tee_is_handle(uv_handle_t * handle) { return handle->type == UV_NAMED_PIPE && diff --git a/include/siri/health.h b/include/siri/health.h index ac82ffd6..dc4bbbb0 100644 --- a/include/siri/health.h +++ b/include/siri/health.h @@ -5,6 +5,7 @@ #define SIRI_HEALTH_H_ #include +#include #include #define SIRIDB_HEALTH_FLAG 1<<30 @@ -13,20 +14,20 @@ typedef struct siri_health_request_s siri_health_request_t; int siri_health_init(void); void siri_health_close(siri_health_request_t * web_request); -static inline _Bool siri_health_is_handle(uv_handle_t * handle); +static inline bool siri_health_is_handle(uv_handle_t * handle); struct siri_health_request_s { uint32_t flags; /* maps to sirnet_stream_t tp for cleanup */ uint32_t pad0_; - _Bool is_closed; + bool is_closed; uv_write_t req; uv_stream_t uvstream; http_parser parser; uv_buf_t * response; }; -static inline _Bool siri_health_is_handle(uv_handle_t * handle) +static inline bool siri_health_is_handle(uv_handle_t * handle) { return handle->type == UV_TCP && diff --git a/include/siri/service/account.h b/include/siri/service/account.h index 8467cb65..5d0e9710 100644 --- a/include/siri/service/account.h +++ b/include/siri/service/account.h @@ -8,6 +8,7 @@ typedef struct siri_service_account_s siri_service_account_t; #include #include +#include int siri_service_account_init(siri_t * siri); void siri_service_account_destroy(siri_t * siri); @@ -27,7 +28,7 @@ int siri_service_account_change_password( qp_obj_t * qp_account, qp_obj_t * qp_password, char * err_msg); -_Bool siri_service_account_check_basic( +bool siri_service_account_check_basic( siri_t * siri, const char * data, size_t n); diff --git a/include/siri/version.h b/include/siri/version.h index c7d0bc1d..820637f8 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "-alpha-1" +#define SIRIDB_VERSION_PRE_RELEASE "-alpha-2" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/itest/requirements.txt b/itest/requirements.txt index fb2fc0c2..257ab1ca 100644 --- a/itest/requirements.txt +++ b/itest/requirements.txt @@ -1,4 +1,4 @@ -siridb-connector +siridb-connector==2.0.5 psutil requests pyleri diff --git a/src/siri/api.c b/src/siri/api.c index b3e4f3b2..fa1dc68d 100644 --- a/src/siri/api.c +++ b/src/siri/api.c @@ -1,10 +1,11 @@ /* * api.c */ -#include -#include #include #include +#include +#include +#include #include #include #include @@ -82,7 +83,7 @@ inline static int api__header( return len; } -static inline _Bool api__istarts_with( +static inline bool api__istarts_with( const char ** str, size_t * strn, const char * with, @@ -97,7 +98,7 @@ static inline _Bool api__istarts_with( return true; } -static inline _Bool api__starts_with( +static inline bool api__starts_with( const char ** str, size_t * strn, const char * with, diff --git a/src/siri/db/buffer.c b/src/siri/db/buffer.c index e80e51d3..c7652fdb 100644 --- a/src/siri/db/buffer.c +++ b/src/siri/db/buffer.c @@ -83,7 +83,7 @@ void siridb_buffer_close(siridb_buffer_t * buffer) } } -_Bool siridb_buffer_is_valid_size(ssize_t ssize) +bool siridb_buffer_is_valid_size(ssize_t ssize) { return ssize >= 512 && (ssize % 512) == 0 && ssize <= MAX_BUFFER_SZ; } diff --git a/src/siri/db/series.c b/src/siri/db/series.c index f844a124..b13fba59 100644 --- a/src/siri/db/series.c +++ b/src/siri/db/series.c @@ -16,9 +16,11 @@ * since they only run when no other references to the object exist. */ #include +#include #include #include #include +#include #include #include #include @@ -28,7 +30,6 @@ #include #include #include -#include #include #define SIRIDB_SERIES_FN "series.dat" @@ -1364,7 +1365,7 @@ static siridb_series_t * SERIES_new( (uint16_t) ((n / 11) % siridb->shard_mask_log) + 600 : (uint16_t) ((n / 11) % siridb->shard_mask_num); - if ((_Bool) ((n / 11) % 2)) + if ((bool) ((n / 11) % 2)) { series->flags |= SIRIDB_SERIES_IS_SERVER_ONE; } diff --git a/src/siri/db/shards.c b/src/siri/db/shards.c index 752a2576..e39e7b5d 100644 --- a/src/siri/db/shards.c +++ b/src/siri/db/shards.c @@ -215,7 +215,9 @@ int siridb_shards_load(siridb_t * siridb) { rc = -1; break; - } else { + } + else + { continue; } } @@ -234,7 +236,9 @@ int siridb_shards_load(siridb_t * siridb) { rc = -1; break; - } else { + } + else + { continue; } } @@ -263,7 +267,7 @@ int siridb_shards_add_points( siridb_series_t * series, siridb_points_t * points) { - _Bool is_num = siridb_series_isnum(series); + bool is_num = siridb_series_isnum(series); siridb_shard_t * shard; omap_t * shards; uint64_t duration = siridb_series_duration(series); diff --git a/src/siri/db/users.c b/src/siri/db/users.c index 5da13c32..562919ba 100644 --- a/src/siri/db/users.c +++ b/src/siri/db/users.c @@ -237,7 +237,7 @@ siridb_user_t * siridb_users_get_user( else if (user->password[0] == '$') { /* this will migrate as soon as a user logs in */ - _Bool is_valid; + bool is_valid; fallback_data.initialized = 0; fallback_pw = crypt_r(password, user->password, &fallback_data); is_valid = strcmp(fallback_pw, user->password) == 0; diff --git a/src/siri/evars.c b/src/siri/evars.c index af2ba507..c3c37ba5 100644 --- a/src/siri/evars.c +++ b/src/siri/evars.c @@ -1,7 +1,7 @@ /* * siri/evars.c */ - +#include #include #include @@ -11,7 +11,7 @@ static void evars__bool(const char * evar, uint8_t * b) if (!u8str) return; - *b = (_Bool) strtoul(u8str, NULL, 10); + *b = (bool) strtoul(u8str, NULL, 10); } static void evars__u16(const char * evar, uint16_t * u16) diff --git a/src/siri/service/account.c b/src/siri/service/account.c index 8738e8a4..dad9b282 100644 --- a/src/siri/service/account.c +++ b/src/siri/service/account.c @@ -301,7 +301,7 @@ static int ACCOUNT_cmp_str(siri_service_account_t * account, char * str) } -_Bool siri_service_account_check_basic( +bool siri_service_account_check_basic( siri_t * siri, const char * data, size_t n) @@ -309,7 +309,7 @@ _Bool siri_service_account_check_basic( siri_service_account_t * account; size_t size, nn, end; char * b64 = base64_decode(data, n, &size); - _Bool is_valid = false; + bool is_valid = false; char pw[OWCRYPT_SZ]; for (nn = 0, end = size; nn < end; ++nn) diff --git a/src/siri/service/request.c b/src/siri/service/request.c index 3a37b2fb..12560ce1 100644 --- a/src/siri/service/request.c +++ b/src/siri/service/request.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -449,7 +450,7 @@ static cproto_server_t SERVICE_on_drop_database( qp_unpacker_t * qp_unpacker, char * err_msg) { - _Bool ignore_offline; + bool ignore_offline; siridb_t * siridb; qp_obj_t qp_key, qp_target, qp_ignore_offline; sirinet_pkg_t * pkg; diff --git a/test/test_lookup/test_lookup.c b/test/test_lookup/test_lookup.c index ec065a33..eb12b512 100644 --- a/test/test_lookup/test_lookup.c +++ b/test/test_lookup/test_lookup.c @@ -1,6 +1,7 @@ #include "../test.h" #include +#include /* to at least 42 pools we devide series within 20% off from ideal */ @@ -48,7 +49,7 @@ int main() for (n = 0; n < SIRIDB_LOOKUP_SZ; ++n) { /* check for SIRIDB_SERIES_IS_SERVER_ONE flag */ - if ((_Bool) ((n / 11) % 2)) + if ((bool) ((n / 11) % 2)) { countersa[(*lookup)[n]]++; }