memcached
diff --git a/‎proto_parser.c
Lines changed: 9 additions & 2 deletions b/‎proto_parser.c
Lines changed: 9 additions & 2 deletions
diff --git a/‎proto_text.c
Lines changed: 3 additions & 7 deletions b/‎proto_text.c
Lines changed: 3 additions & 7 deletions
@@ -332,6 +332,15 @@ int process_request(mcp_parser_t *pr, const char *command, size_t cmdlen) {
  * PARSER UTIL CODE
  */
 
+// TODO:
+// - the safe_strto calls in here are still "string-y" - they're going to
+// parse until a space or newline. This is perfectly safe for any time we're
+// in this code; since we can't get here without a \n or a space (ie;
+// non-digit)
+// - I'm not converting these to tokto*'s right now, because what they're
+// pulling the flag while in a loop. So we need yet another interface (or
+// refactor of existing interface). This code is safe, just not consistent.
+
 int mc_prcmp(mcp_parser_t *pr, int token, const char *s) {
     int len = 0;
     const char *t = mcmc_token_get(pr->request, &pr->tok, token, &len);
@@ -730,8 +739,6 @@ item *process_update_cmd_start(LIBEVENT_THREAD *t, mcp_parser_t *pr, mc_resp *re
         return NULL;
     }
 
-    // TODO: convert to mcmc_token_etc which do not use strtol underneath.
-    // safe_strtoflags is an alias based on large client flags :(
     if (! (safe_strtoflags(&pr->request[pr->tok.tokens[2]], &flags)
            && safe_strtol(&pr->request[pr->tok.tokens[3]], &exptime_int))) {
         pout_string(resp, "CLIENT_ERROR bad command line format");
 
@@ -435,7 +435,7 @@ static void process_get_command(conn *c, LIBEVENT_THREAD *t, mcp_parser_t *pr, p
 
     if (should_touch) {
         int32_t exptime_int = 0;
-        if (!safe_strtol(&pr->request[pr->tok.tokens[1]], &exptime_int)) {
+        if (!mc_tokto32(pr, 1, &exptime_int)) {
             out_string(c, "CLIENT_ERROR invalid exptime argument");
             return;
         }
@@ -893,19 +893,15 @@ static void process_slabs_automove_command(conn *c, mcp_parser_t *pr) {
 
     const char *subcmd = mcmc_token_get(pr->request, &pr->tok, 2, &len);
     if (strncmp(subcmd, "ratio", len) == 0) {
-        int vlen = 0;
-        const char *val = mcmc_token_get(pr->request, &pr->tok, 3, &vlen);
-        if (ntokens < 4 || !safe_strtod(val, &ratio)) {
+        if (ntokens < 4 || !mc_toktod(pr, 3, &ratio)) {
             out_string(c, "ERROR");
             return;
         }
         // TODO: settings needs an overhaul... no locks/etc.
         settings.slab_automove_ratio = ratio;
         settings.slab_automove_version++;
     } else if (strncmp(subcmd, "freeratio", len) == 0) {
-        int vlen = 0;
-        const char *val = mcmc_token_get(pr->request, &pr->tok, 3, &vlen);
-        if (ntokens < 4 || !safe_strtod(val, &ratio)) {
+        if (ntokens < 4 || !mc_toktod(pr, 3, &ratio)) {
             out_string(c, "ERROR");
             return;
         }