mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: don't hardcode array length

Browse source 
Move the ARRAY_SIZE macro into a header file and use it to determine the
number of cloud servers that we need to check.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-04-19 11:37:46 -07:00
parent 9620d11828
commit 194fe28d50
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/checkcloudconnection.cpp
View file

@ -106,7 +106,7 @@ bool CheckCloudConnection::nextServer()
{ CLOUD_HOST_US, false } { CLOUD_HOST_US, false }
}; };
const char *server = nullptr; const char *server = nullptr;
for (int i = 0; i < CLOUD_NUM_HOSTS; i++) { for (unsigned int i = 0; i < ARRAY_SIZE(cloudServers); i++) {
if (strstr(prefs.cloud_base_url, cloudServers[i].server)) if (strstr(prefs.cloud_base_url, cloudServers[i].server))
cloudServers[i].tried = true; cloudServers[i].tried = true;
else if (cloudServers[i].tried == false) else if (cloudServers[i].tried == false)

3
core/git-access.h
View file

@ -15,12 +15,13 @@ extern "C" {
#include <stdbool.h> #include <stdbool.h>
#endif #endif
#define CLOUD_NUM_HOSTS 2
#define CLOUD_HOST_US "ssrf-cloud-us.subsurface-divelog.org" #define CLOUD_HOST_US "ssrf-cloud-us.subsurface-divelog.org"
#define CLOUD_HOST_EU "ssrf-cloud-eu.subsurface-divelog.org" #define CLOUD_HOST_EU "ssrf-cloud-eu.subsurface-divelog.org"
#define CLOUD_HOST_PATTERN "ssrf-cloud-..\\.subsurface-divelog\\.org" #define CLOUD_HOST_PATTERN "ssrf-cloud-..\\.subsurface-divelog\\.org"
#define CLOUD_HOST_GENERIC "cloud.subsurface-divelog.org" #define CLOUD_HOST_GENERIC "cloud.subsurface-divelog.org"
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
enum remote_transport { RT_OTHER, RT_HTTPS, RT_SSH }; enum remote_transport { RT_OTHER, RT_HTTPS, RT_SSH };
struct git_oid; struct git_oid;

1
core/load-git.c
View file

@ -58,7 +58,6 @@ struct keyword_action {
const char *keyword; const char *keyword;
void (*fn)(char *, struct membuffer *, struct git_parser_state *); void (*fn)(char *, struct membuffer *, struct git_parser_state *);
}; };
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
static git_blob *git_tree_entry_blob(git_repository *repo, const git_tree_entry *entry); static git_blob *git_tree_entry_blob(git_repository *repo, const git_tree_entry *entry);