Commit 49841a54 authored by antirez's avatar antirez
Browse files

Fix merge errors.

For some reason I made a merge fiasco between 5.0 and unstable.
This fixes the error introduced by merging unstable.
parent 77a7ec72
...@@ -1107,10 +1107,6 @@ void configSetCommand(client *c) { ...@@ -1107,10 +1107,6 @@ void configSetCommand(client *c) {
"stream-node-max-bytes",server.stream_node_max_bytes,0,LONG_MAX) { "stream-node-max-bytes",server.stream_node_max_bytes,0,LONG_MAX) {
} config_set_numerical_field( } config_set_numerical_field(
"stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) { "stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) {
} config_set_numerical_field(
"stream-node-max-bytes",server.stream_node_max_bytes,0,LLONG_MAX) {
} config_set_numerical_field(
"stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) {
} config_set_numerical_field( } config_set_numerical_field(
"list-max-ziplist-size",server.list_max_ziplist_size,INT_MIN,INT_MAX) { "list-max-ziplist-size",server.list_max_ziplist_size,INT_MIN,INT_MAX) {
} config_set_numerical_field( } config_set_numerical_field(
......
...@@ -722,9 +722,6 @@ void streamIteratorRemoveEntry(streamIterator *si, streamID *current) { ...@@ -722,9 +722,6 @@ void streamIteratorRemoveEntry(streamIterator *si, streamID *current) {
/* Update the number of entries counter. */ /* Update the number of entries counter. */
si->stream->length--; si->stream->length--;
/* Update the number of entries counter. */
si->stream->length--;
/* Re-seek the iterator to fix the now messed up state. */ /* Re-seek the iterator to fix the now messed up state. */
streamID start, end; streamID start, end;
if (si->rev) { if (si->rev) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment