summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2015-02-24 11:31:04 -0500
committerantirez <antirez@gmail.com>2015-02-24 17:39:59 +0100
commit47ab570441f8012fb9aa6a0b38606bc9462e2bd3 (patch)
tree4731a55dd056265a2335ee6fd0c0a8f985c2dab0
parentd83c810265c5c27ceec418b394860f82bb9ac446 (diff)
downloadredis-47ab570441f8012fb9aa6a0b38606bc9462e2bd3.tar.gz
Fix types broken by previous type cleanup
Revert some size_t back to off_t Set reply_bytes needs to 64 bits everywhere Revert bufpos to int since it's a max of 16k into buf[]
-rw-r--r--src/redis.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/redis.h b/src/redis.h
index ed4c3a813..e248d2901 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -543,7 +543,7 @@ typedef struct redisClient {
int multibulklen; /* number of multi bulk arguments left to read */
long bulklen; /* length of bulk argument in multi bulk request */
list *reply;
- size_t reply_bytes; /* Tot bytes of objects in reply list */
+ unsigned long long reply_bytes; /* Tot bytes of objects in reply list */
size_t sentlen; /* Amount of bytes already sent in the current
buffer or object being sent. */
time_t ctime; /* Client creation time */
@@ -554,8 +554,8 @@ typedef struct redisClient {
int replstate; /* replication state if this is a slave */
int repl_put_online_on_ack; /* Install slave write handler on ACK. */
int repldbfd; /* replication DB file descriptor */
- size_t repldboff; /* replication DB file offset */
- size_t repldbsize; /* replication DB file size */
+ off_t repldboff; /* replication DB file offset */
+ off_t repldbsize; /* replication DB file size */
sds replpreamble; /* replication DB preamble. */
long long reploff; /* replication offset if this is our master */
long long repl_ack_off; /* replication ack offset, if this is a slave */
@@ -572,7 +572,7 @@ typedef struct redisClient {
sds peerid; /* Cached peer ID. */
/* Response buffer */
- size_t bufpos;
+ int bufpos;
char buf[REDIS_REPLY_CHUNK_BYTES];
} redisClient;