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
redis
Commits
68db7b1f
Commit
68db7b1f
authored
Aug 12, 2014
by
antirez
Browse files
Use unsigned integers in SDS header.
This raises the max string to 4GB without any downside.
parent
cf85b5ba
Changes
4
Hide whitespace changes
Inline
Side-by-side
deps/hiredis/sds.c
View file @
68db7b1f
...
...
@@ -123,7 +123,7 @@ void sdsclear(sds s) {
/* Enlarge the free space at the end of the sds string so that the caller
* is sure that after calling this function can overwrite up to addlen
* bytes after the end of the string, plus one more byte for nul term.
*
*
* Note: this does not change the *length* of the sds string as returned
* by sdslen(), but only the free buffer space we have. */
sds
sdsMakeRoomFor
(
sds
s
,
size_t
addlen
)
{
...
...
@@ -200,7 +200,10 @@ size_t sdsAllocSize(sds s) {
void
sdsIncrLen
(
sds
s
,
int
incr
)
{
struct
sdshdr
*
sh
=
(
void
*
)
(
s
-
(
sizeof
(
struct
sdshdr
)));
assert
(
sh
->
free
>=
incr
);
if
(
incr
>=
0
)
assert
(
sh
->
free
>=
(
unsigned
int
)
incr
);
else
assert
(
sh
->
len
>=
(
unsigned
int
)(
-
incr
));
sh
->
len
+=
incr
;
sh
->
free
-=
incr
;
assert
(
sh
->
free
>=
0
);
...
...
@@ -457,7 +460,7 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
i
=
initlen
;
/* Position of the next byte to write to dest str. */
while
(
*
f
)
{
char
next
,
*
str
;
int
l
;
unsigned
int
l
;
long
long
num
;
unsigned
long
long
unum
;
...
...
deps/hiredis/sds.h
View file @
68db7b1f
...
...
@@ -39,8 +39,8 @@
typedef
char
*
sds
;
struct
sdshdr
{
int
len
;
int
free
;
unsigned
int
len
;
unsigned
int
free
;
char
buf
[];
};
...
...
src/sds.c
View file @
68db7b1f
...
...
@@ -200,7 +200,10 @@ size_t sdsAllocSize(sds s) {
void
sdsIncrLen
(
sds
s
,
int
incr
)
{
struct
sdshdr
*
sh
=
(
void
*
)
(
s
-
(
sizeof
(
struct
sdshdr
)));
assert
(
sh
->
free
>=
incr
);
if
(
incr
>=
0
)
assert
(
sh
->
free
>=
(
unsigned
int
)
incr
);
else
assert
(
sh
->
len
>=
(
unsigned
int
)(
-
incr
));
sh
->
len
+=
incr
;
sh
->
free
-=
incr
;
assert
(
sh
->
free
>=
0
);
...
...
@@ -458,7 +461,7 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
i
=
initlen
;
/* Position of the next byte to write to dest str. */
while
(
*
f
)
{
char
next
,
*
str
;
int
l
;
unsigned
int
l
;
long
long
num
;
unsigned
long
long
unum
;
...
...
src/sds.h
View file @
68db7b1f
...
...
@@ -39,8 +39,8 @@
typedef
char
*
sds
;
struct
sdshdr
{
int
len
;
int
free
;
unsigned
int
len
;
unsigned
int
free
;
char
buf
[];
};
...
...
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