diff options
| author | Simon Rettberg | 2019-09-02 13:26:47 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-09-02 13:26:47 +0200 |
| commit | 0edf0a0888b1e40769e19eee031c2cefdcf37d26 (patch) | |
| tree | 636a22a461b9c6fd9fbf72759796975522a7986b | |
| parent | [SERVER] uplink: Don't reinit uplink when freeing it (diff) | |
| download | dnbd3-0edf0a0888b1e40769e19eee031c2cefdcf37d26.tar.gz dnbd3-0edf0a0888b1e40769e19eee031c2cefdcf37d26.tar.xz dnbd3-0edf0a0888b1e40769e19eee031c2cefdcf37d26.zip | |
[SERVER] Fix compiler warnings
| -rw-r--r-- | src/server/altservers.c | 4 | ||||
| -rw-r--r-- | src/server/reference.h | 4 | ||||
| -rw-r--r-- | src/shared/protocol.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/altservers.c b/src/server/altservers.c index ff3c95b..9e30cd0 100644 --- a/src/server/altservers.c +++ b/src/server/altservers.c @@ -140,7 +140,7 @@ int altservers_getListForClient(dnbd3_host_t *host, dnbd3_server_entry_t *output if ( altServers[i].host.type == 0 || altServers[i].isPrivate ) continue; // Slot is empty or uplink is for replication only if ( host->type == altServers[i].host.type ) { - scores[i] = 10 + altservers_netCloseness( host, &altServers[i].host ); + scores[i] = (uint16_t)( 10 + altservers_netCloseness( host, &altServers[i].host ) ); } else { scores[i] = 1; // Wrong address family } @@ -400,7 +400,7 @@ const dnbd3_host_t* altservers_indexToHost(int server) static void altservers_findUplinkInternal(dnbd3_uplink_t *uplink) { const int ALTS = 4; - int ret, itAlt, numAlts, current; + int itAlt, numAlts, current; bool panic; int servers[ALTS + 1]; struct timespec start, end; diff --git a/src/server/reference.h b/src/server/reference.h index 2a80955..4eda546 100644 --- a/src/server/reference.h +++ b/src/server/reference.h @@ -46,12 +46,12 @@ static inline void ref_put( ref *ref ) } } -#define ref_get_uplink(wr) ({ \ +#define ref_get_uplink(wr) __extension__({ \ ref* ref = ref_get( wr ); \ ref == NULL ? NULL : container_of(ref, dnbd3_uplink_t, reference); \ }) -#define ref_get_cachemap(image) ({ \ +#define ref_get_cachemap(image) __extension__({ \ ref* ref = ref_get( &(image)->ref_cacheMap ); \ ref == NULL ? NULL : container_of(ref, dnbd3_cache_map_t, reference); \ }) diff --git a/src/shared/protocol.h b/src/shared/protocol.h index 92dbe11..2b21c21 100644 --- a/src/shared/protocol.h +++ b/src/shared/protocol.h @@ -20,7 +20,7 @@ #define COND_HOPCOUNT(vers,hopcount) ( (vers) >= 3 ? (hopcount) : 0 ) // 2017-11-02: Macro to set flags in select image message properly if we're a server, as BG_REP depends on global var -#define SI_SERVER_FLAGS ( (_pretendClient ? 0 : FLAGS8_SERVER) | (_backgroundReplication == BGR_FULL ? FLAGS8_BG_REP : 0) ) +#define SI_SERVER_FLAGS ( (uint8_t)( (_pretendClient ? 0 : FLAGS8_SERVER) | (_backgroundReplication == BGR_FULL ? FLAGS8_BG_REP : 0) ) ) #define REPLY_OK (0) #define REPLY_ERRNO (-1) |