Changeset 619 for trunk/server/memcached.c

Timestamp:

10/03/07 20:45:31 (2 years ago)

Author:

plindner

Message:

Switch to unsigned 64-bit increment/decrement counters from Evan Miller and Dusgtin Sallings.

Files:

• trunk/server/memcached.c (modified) (6 diffs)

trunk/server/memcached.c

@@ -1259 +1259 @@
 }
 
-static void process_arithmetic_command(conn *c, token_t *tokens, const size_t ntokens, const int incr) {
-    char temp[32];
+static void process_arithmetic_command(conn *c, token_t *tokens, const size_t ntokens, const bool incr) {
+    char temp[sizeof("18446744073709551615")];
     item *it;
-    unsigned int delta;
+    int64_t delta;
     char *key;
     size_t nkey;
@@ -1289 +1289 @@
     }
 
-    delta = strtoul(tokens[2].value, NULL, 10);
+    delta = strtoll(tokens[2].value, NULL, 10);
 
     if(errno == ERANGE) {
@@ -1316 +1316 @@
  * returns a response string to send back to the client.
  */
-char *do_add_delta(item *it, const int incr, const unsigned int delta, char *buf) {
+char *do_add_delta(item *it, const bool incr, const int64_t delta, char *buf) {
     char *ptr;
-    uint32_t value;
+    int64_t value;
     int res;
 
@@ -1324 +1324 @@
     while ((*ptr != '\0') && (*ptr < '0' && *ptr > '9')) ptr++;    // BUG: can't be true
 
-    value = strtoul(ptr, NULL, 10);
+    value = strtoull(ptr, NULL, 10);
 
     if(errno == ERANGE) {
@@ -1330 +1330 @@
     }
 
-    if (incr != 0)
+    if (incr)
         value += delta;
     else {
@@ -1336 +1336 @@
         else value -= delta;
     }
-    snprintf(buf, 32, "%u", value);
+    sprintf(buf, "%llu", value);
     res = strlen(buf);
     if (res + 2 > it->nbytes) { /* need to realloc */