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
7c44a9d7
Unverified
Commit
7c44a9d7
authored
Apr 05, 2022
by
Michael Grunder
Committed by
GitHub
Apr 05, 2022
Browse files
Merge pull request #1045 from Nordix/sds-updates
Update hiredis sds with improvements found in redis
parents
f8de9a4b
00b82683
Changes
1
Hide whitespace changes
Inline
Side-by-side
sds.c
View file @
7c44a9d7
...
...
@@ -90,6 +90,7 @@ sds sdsnewlen(const void *init, size_t initlen) {
int
hdrlen
=
sdsHdrSize
(
type
);
unsigned
char
*
fp
;
/* flags pointer. */
if
(
hdrlen
+
initlen
+
1
<=
initlen
)
return
NULL
;
/* Catch size_t overflow */
sh
=
s_malloc
(
hdrlen
+
initlen
+
1
);
if
(
sh
==
NULL
)
return
NULL
;
if
(
!
init
)
...
...
@@ -174,7 +175,7 @@ void sdsfree(sds s) {
* the output will be "6" as the string was modified but the logical length
* remains 6 bytes. */
void
sdsupdatelen
(
sds
s
)
{
in
t
reallen
=
strlen
(
s
);
size_
t
reallen
=
strlen
(
s
);
sdssetlen
(
s
,
reallen
);
}
...
...
@@ -196,7 +197,7 @@ void sdsclear(sds s) {
sds
sdsMakeRoomFor
(
sds
s
,
size_t
addlen
)
{
void
*
sh
,
*
newsh
;
size_t
avail
=
sdsavail
(
s
);
size_t
len
,
newlen
;
size_t
len
,
newlen
,
reqlen
;
char
type
,
oldtype
=
s
[
-
1
]
&
SDS_TYPE_MASK
;
int
hdrlen
;
...
...
@@ -205,7 +206,8 @@ sds sdsMakeRoomFor(sds s, size_t addlen) {
len
=
sdslen
(
s
);
sh
=
(
char
*
)
s
-
sdsHdrSize
(
oldtype
);
newlen
=
(
len
+
addlen
);
reqlen
=
newlen
=
(
len
+
addlen
);
if
(
newlen
<=
len
)
return
NULL
;
/* Catch size_t overflow */
if
(
newlen
<
SDS_MAX_PREALLOC
)
newlen
*=
2
;
else
...
...
@@ -219,6 +221,7 @@ sds sdsMakeRoomFor(sds s, size_t addlen) {
if
(
type
==
SDS_TYPE_5
)
type
=
SDS_TYPE_8
;
hdrlen
=
sdsHdrSize
(
type
);
if
(
hdrlen
+
newlen
+
1
<=
reqlen
)
return
NULL
;
/* Catch size_t overflow */
if
(
oldtype
==
type
)
{
newsh
=
s_realloc
(
sh
,
hdrlen
+
newlen
+
1
);
if
(
newsh
==
NULL
)
return
NULL
;
...
...
@@ -580,7 +583,7 @@ sds sdscatprintf(sds s, const char *fmt, ...) {
*/
sds
sdscatfmt
(
sds
s
,
char
const
*
fmt
,
...)
{
const
char
*
f
=
fmt
;
int
i
;
long
i
;
va_list
ap
;
va_start
(
ap
,
fmt
);
...
...
@@ -755,14 +758,14 @@ int sdsrange(sds s, ssize_t start, ssize_t end) {
/* Apply tolower() to every character of the sds string 's'. */
void
sdstolower
(
sds
s
)
{
in
t
len
=
sdslen
(
s
),
j
;
size_
t
len
=
sdslen
(
s
),
j
;
for
(
j
=
0
;
j
<
len
;
j
++
)
s
[
j
]
=
tolower
(
s
[
j
]);
}
/* Apply toupper() to every character of the sds string 's'. */
void
sdstoupper
(
sds
s
)
{
in
t
len
=
sdslen
(
s
),
j
;
size_
t
len
=
sdslen
(
s
),
j
;
for
(
j
=
0
;
j
<
len
;
j
++
)
s
[
j
]
=
toupper
(
s
[
j
]);
}
...
...
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