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[]
This commit is contained in:
Matt Stancliff 2015-02-24 11:31:04 -05:00 committed by antirez
parent d83c810265
commit 47ab570441

View File

@ -543,7 +543,7 @@ typedef struct redisClient {
int multibulklen; /* number of multi bulk arguments left to read */ int multibulklen; /* number of multi bulk arguments left to read */
long bulklen; /* length of bulk argument in multi bulk request */ long bulklen; /* length of bulk argument in multi bulk request */
list *reply; 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 size_t sentlen; /* Amount of bytes already sent in the current
buffer or object being sent. */ buffer or object being sent. */
time_t ctime; /* Client creation time */ time_t ctime; /* Client creation time */
@ -554,8 +554,8 @@ typedef struct redisClient {
int replstate; /* replication state if this is a slave */ int replstate; /* replication state if this is a slave */
int repl_put_online_on_ack; /* Install slave write handler on ACK. */ int repl_put_online_on_ack; /* Install slave write handler on ACK. */
int repldbfd; /* replication DB file descriptor */ int repldbfd; /* replication DB file descriptor */
size_t repldboff; /* replication DB file offset */ off_t repldboff; /* replication DB file offset */
size_t repldbsize; /* replication DB file size */ off_t repldbsize; /* replication DB file size */
sds replpreamble; /* replication DB preamble. */ sds replpreamble; /* replication DB preamble. */
long long reploff; /* replication offset if this is our master */ long long reploff; /* replication offset if this is our master */
long long repl_ack_off; /* replication ack offset, if this is a slave */ 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. */ sds peerid; /* Cached peer ID. */
/* Response buffer */ /* Response buffer */
size_t bufpos; int bufpos;
char buf[REDIS_REPLY_CHUNK_BYTES]; char buf[REDIS_REPLY_CHUNK_BYTES];
} redisClient; } redisClient;