Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
173f16ab
Commit
173f16ab
authored
May 08, 2019
by
Marcus Geelnard
Committed by
m
Aug 09, 2019
Browse files
MSVC: Fix some compiler warnings in sds.h
parent
85fee256
Changes
1
Hide whitespace changes
Inline
Side-by-side
sds.h
View file @
173f16ab
...
...
@@ -135,20 +135,20 @@ static inline void sdssetlen(sds s, size_t newlen) {
case
SDS_TYPE_5
:
{
unsigned
char
*
fp
=
((
unsigned
char
*
)
s
)
-
1
;
*
fp
=
SDS_TYPE_5
|
(
newlen
<<
SDS_TYPE_BITS
);
*
fp
=
(
unsigned
char
)(
SDS_TYPE_5
|
(
newlen
<<
SDS_TYPE_BITS
)
)
;
}
break
;
case
SDS_TYPE_8
:
SDS_HDR
(
8
,
s
)
->
len
=
newlen
;
SDS_HDR
(
8
,
s
)
->
len
=
(
uint8_t
)
newlen
;
break
;
case
SDS_TYPE_16
:
SDS_HDR
(
16
,
s
)
->
len
=
newlen
;
SDS_HDR
(
16
,
s
)
->
len
=
(
uint16_t
)
newlen
;
break
;
case
SDS_TYPE_32
:
SDS_HDR
(
32
,
s
)
->
len
=
newlen
;
SDS_HDR
(
32
,
s
)
->
len
=
(
uint32_t
)
newlen
;
break
;
case
SDS_TYPE_64
:
SDS_HDR
(
64
,
s
)
->
len
=
newlen
;
SDS_HDR
(
64
,
s
)
->
len
=
(
uint64_t
)
newlen
;
break
;
}
}
...
...
@@ -159,21 +159,21 @@ static inline void sdsinclen(sds s, size_t inc) {
case
SDS_TYPE_5
:
{
unsigned
char
*
fp
=
((
unsigned
char
*
)
s
)
-
1
;
unsigned
char
newlen
=
SDS_TYPE_5_LEN
(
flags
)
+
inc
;
unsigned
char
newlen
=
SDS_TYPE_5_LEN
(
flags
)
+
(
unsigned
char
)
inc
;
*
fp
=
SDS_TYPE_5
|
(
newlen
<<
SDS_TYPE_BITS
);
}
break
;
case
SDS_TYPE_8
:
SDS_HDR
(
8
,
s
)
->
len
+=
inc
;
SDS_HDR
(
8
,
s
)
->
len
+=
(
uint8_t
)
inc
;
break
;
case
SDS_TYPE_16
:
SDS_HDR
(
16
,
s
)
->
len
+=
inc
;
SDS_HDR
(
16
,
s
)
->
len
+=
(
uint16_t
)
inc
;
break
;
case
SDS_TYPE_32
:
SDS_HDR
(
32
,
s
)
->
len
+=
inc
;
SDS_HDR
(
32
,
s
)
->
len
+=
(
uint32_t
)
inc
;
break
;
case
SDS_TYPE_64
:
SDS_HDR
(
64
,
s
)
->
len
+=
inc
;
SDS_HDR
(
64
,
s
)
->
len
+=
(
uint64_t
)
inc
;
break
;
}
}
...
...
@@ -203,16 +203,16 @@ static inline void sdssetalloc(sds s, size_t newlen) {
/* Nothing to do, this type has no total allocation info. */
break
;
case
SDS_TYPE_8
:
SDS_HDR
(
8
,
s
)
->
alloc
=
newlen
;
SDS_HDR
(
8
,
s
)
->
alloc
=
(
uint8_t
)
newlen
;
break
;
case
SDS_TYPE_16
:
SDS_HDR
(
16
,
s
)
->
alloc
=
newlen
;
SDS_HDR
(
16
,
s
)
->
alloc
=
(
uint16_t
)
newlen
;
break
;
case
SDS_TYPE_32
:
SDS_HDR
(
32
,
s
)
->
alloc
=
newlen
;
SDS_HDR
(
32
,
s
)
->
alloc
=
(
uint32_t
)
newlen
;
break
;
case
SDS_TYPE_64
:
SDS_HDR
(
64
,
s
)
->
alloc
=
newlen
;
SDS_HDR
(
64
,
s
)
->
alloc
=
(
uint64_t
)
newlen
;
break
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment