gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warnings for mac build

Browse Source 
Former-commit-id: 570fbd014944a655f6c8e7216f2b9226f378c7c7
This commit is contained in:
christianEQ 2021-07-15 20:14:14 +00:00
parent a833c9b2a7
commit 43f31da324
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -29,7 +29,7 @@ ifneq (,$(findstring FreeBSD,$(uname_S)))
STD+=-Wno-c11-extensions STD+=-Wno-c11-extensions
endif endif
endif endif
WARN=-Wall -W -Wno-missing-field-initializers WARN=-Wall -W -Wno-missing-field-initializers -Wno-address-of-packed-member -Wno-atomic-alignment
OPT=$(OPTIMIZATION) OPT=$(OPTIMIZATION)
# Detect if the compiler supports C11 _Atomic # Detect if the compiler supports C11 _Atomic

3
src/connection.cpp
View File

@ -437,6 +437,9 @@ void connSetThreadAffinity(connection *conn, int cpu) {
{ {
serverLog(LL_WARNING, "Failed to set socket affinity"); serverLog(LL_WARNING, "Failed to set socket affinity");
} }
#else
(void)conn;
(void)cpu;
#endif #endif
} }

2
src/replication.cpp
View File

@ -4803,7 +4803,7 @@ void replicationNotifyLoadedKey(redisDb *db, robj_roptr key, robj_roptr val, lon
redisObjectStack objTtl; redisObjectStack objTtl;
initStaticStringObject(objTtl, sdscatprintf(sdsempty(), "%lld", expire)); initStaticStringObject(objTtl, sdscatprintf(sdsempty(), "%lld", expire));
redisObjectStack objMvcc; redisObjectStack objMvcc;
initStaticStringObject(objMvcc, sdscatprintf(sdsempty(), "%lu", mvccFromObj(val))); initStaticStringObject(objMvcc, sdscatprintf(sdsempty(), "%" PRIu64, mvccFromObj(val)));
redisObject *argv[5] = {shared.mvccrestore, key.unsafe_robjcast(), &objMvcc, &objTtl, &objPayload}; redisObject *argv[5] = {shared.mvccrestore, key.unsafe_robjcast(), &objMvcc, &objTtl, &objPayload};
replicationFeedSlaves(g_pserver->slaves, db - g_pserver->db, argv, 5); replicationFeedSlaves(g_pserver->slaves, db - g_pserver->db, argv, 5);

6
src/t_set.cpp
View File

@ -512,7 +512,7 @@ void spopWithCountCommand(client *c) {
const char *sdsele; const char *sdsele;
robj *objele; robj *objele;
int encoding; int encoding;
int64_t llele; int64_t llele = 0;
unsigned long remaining = size-count; /* Elements left after SPOP. */ unsigned long remaining = size-count; /* Elements left after SPOP. */
/* If we are here, the number of requested elements is less than the /* If we are here, the number of requested elements is less than the
@ -664,7 +664,7 @@ void srandmemberWithCountCommand(client *c) {
int uniq = 1; int uniq = 1;
robj_roptr set; robj_roptr set;
const char *ele; const char *ele;
int64_t llele; int64_t llele = 0;
int encoding; int encoding;
dict *d; dict *d;
@ -813,7 +813,7 @@ void srandmemberWithCountCommand(client *c) {
void srandmemberCommand(client *c) { void srandmemberCommand(client *c) {
robj_roptr set; robj_roptr set;
const char *ele; const char *ele;
int64_t llele; int64_t llele = 0;
int encoding; int encoding;
if (c->argc == 3) { if (c->argc == 3) {

4
src/t_stream.cpp
View File

@ -842,7 +842,7 @@ int64_t streamTrim(stream *s, streamAddTrimArgs *args) {
/* Trims a stream by length. Returns the number of deleted items. */ /* Trims a stream by length. Returns the number of deleted items. */
int64_t streamTrimByLength(stream *s, long long maxlen, int approx) { int64_t streamTrimByLength(stream *s, long long maxlen, int approx) {
streamAddTrimArgs args = {0}; streamAddTrimArgs args = {{0}};
args.trim_strategy = TRIM_STRATEGY_MAXLEN; args.trim_strategy = TRIM_STRATEGY_MAXLEN;
args.approx_trim = approx; args.approx_trim = approx;
args.limit = approx ? 100 * g_pserver->stream_node_max_entries : 0; args.limit = approx ? 100 * g_pserver->stream_node_max_entries : 0;
@ -852,7 +852,7 @@ int64_t streamTrimByLength(stream *s, long long maxlen, int approx) {
/* Trims a stream by minimum ID. Returns the number of deleted items. */ /* Trims a stream by minimum ID. Returns the number of deleted items. */
int64_t streamTrimByID(stream *s, streamID minid, int approx) { int64_t streamTrimByID(stream *s, streamID minid, int approx) {
streamAddTrimArgs args = {0}; streamAddTrimArgs args = {{0}};
args.trim_strategy = TRIM_STRATEGY_MINID; args.trim_strategy = TRIM_STRATEGY_MINID;
args.approx_trim = approx; args.approx_trim = approx;
args.limit = approx ? 100 * g_pserver->stream_node_max_entries : 0; args.limit = approx ? 100 * g_pserver->stream_node_max_entries : 0;