Skip to content

Commit 249092a

Browse files
committed
Fix warnings about implicit cast
Added a few explicit casts to sds.h: unsigned char flags = (unsigned char)s[-1]; Signed-off-by: Ted Lyngmo <[email protected]>
1 parent 47c3ece commit 249092a

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

sds.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ typedef long long ssize_t;
4141
#endif
4242

4343
#include <sys/types.h>
44+
4445
#include <stdarg.h>
4546
#include <stdint.h>
4647

@@ -89,7 +90,7 @@ struct __attribute__ ((__packed__)) sdshdr64 {
8990
#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
9091

9192
static inline size_t sdslen(const sds s) {
92-
unsigned char flags = s[-1];
93+
unsigned char flags = (unsigned char)s[-1];
9394
switch(flags&SDS_TYPE_MASK) {
9495
case SDS_TYPE_5:
9596
return SDS_TYPE_5_LEN(flags);
@@ -106,7 +107,7 @@ static inline size_t sdslen(const sds s) {
106107
}
107108

108109
static inline size_t sdsavail(const sds s) {
109-
unsigned char flags = s[-1];
110+
unsigned char flags = (unsigned char)s[-1];
110111
switch(flags&SDS_TYPE_MASK) {
111112
case SDS_TYPE_5: {
112113
return 0;
@@ -132,7 +133,7 @@ static inline size_t sdsavail(const sds s) {
132133
}
133134

134135
static inline void sdssetlen(sds s, size_t newlen) {
135-
unsigned char flags = s[-1];
136+
unsigned char flags = (unsigned char)s[-1];
136137
switch(flags&SDS_TYPE_MASK) {
137138
case SDS_TYPE_5:
138139
{
@@ -156,7 +157,7 @@ static inline void sdssetlen(sds s, size_t newlen) {
156157
}
157158

158159
static inline void sdsinclen(sds s, size_t inc) {
159-
unsigned char flags = s[-1];
160+
unsigned char flags = (unsigned char)s[-1];
160161
switch(flags&SDS_TYPE_MASK) {
161162
case SDS_TYPE_5:
162163
{
@@ -182,7 +183,7 @@ static inline void sdsinclen(sds s, size_t inc) {
182183

183184
/* sdsalloc() = sdsavail() + sdslen() */
184185
static inline size_t sdsalloc(const sds s) {
185-
unsigned char flags = s[-1];
186+
unsigned char flags = (unsigned char)s[-1];
186187
switch(flags&SDS_TYPE_MASK) {
187188
case SDS_TYPE_5:
188189
return SDS_TYPE_5_LEN(flags);
@@ -199,7 +200,7 @@ static inline size_t sdsalloc(const sds s) {
199200
}
200201

201202
static inline void sdssetalloc(sds s, size_t newlen) {
202-
unsigned char flags = s[-1];
203+
unsigned char flags = (unsigned char)s[-1];
203204
switch(flags&SDS_TYPE_MASK) {
204205
case SDS_TYPE_5:
205206
/* Nothing to do, this type has no total allocation info. */

0 commit comments

Comments
 (0)