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
e8dd99fa
Commit
e8dd99fa
authored
Apr 15, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
7f794a12
dfd3ead9
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/geohash.c
View file @
e8dd99fa
...
...
@@ -206,7 +206,11 @@ int geohashDecodeWGS84(const GeoHashBits hash, GeoHashArea *area) {
int
geohashDecodeAreaToLongLat
(
const
GeoHashArea
*
area
,
double
*
xy
)
{
if
(
!
xy
)
return
0
;
xy
[
0
]
=
(
area
->
longitude
.
min
+
area
->
longitude
.
max
)
/
2
;
if
(
xy
[
0
]
>
GEO_LONG_MAX
)
xy
[
0
]
=
GEO_LONG_MAX
;
if
(
xy
[
0
]
<
GEO_LONG_MIN
)
xy
[
0
]
=
GEO_LONG_MIN
;
xy
[
1
]
=
(
area
->
latitude
.
min
+
area
->
latitude
.
max
)
/
2
;
if
(
xy
[
1
]
>
GEO_LAT_MAX
)
xy
[
1
]
=
GEO_LAT_MAX
;
if
(
xy
[
1
]
<
GEO_LAT_MIN
)
xy
[
1
]
=
GEO_LAT_MIN
;
return
1
;
}
...
...
src/timeout.c
View file @
e8dd99fa
...
...
@@ -166,7 +166,7 @@ int getTimeoutFromObjectOrReply(client *c, robj *object, mstime_t *timeout, int
if
(
unit
==
UNIT_SECONDS
)
{
if
(
getLongDoubleFromObjectOrReply
(
c
,
object
,
&
ftval
,
"timeout is not a
n
float or out of range"
)
!=
C_OK
)
"timeout is not a float or out of range"
)
!=
C_OK
)
return
C_ERR
;
tval
=
(
long
long
)
(
ftval
*
1000
.
0
);
}
else
{
...
...
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