Commit f0b2c13a authored by Daniel Gustafsson's avatar Daniel Gustafsson
Browse files

memcmp: avoid doing single char memcmp 



There is no real gain in performing memcmp() comparisons on single
characters, so change these to array subscript inspections which
saves a call and makes the code clearer.

Closes #3486
Reviewed-by: default avatarDaniel Stenberg <daniel@haxx.se>
Reviewed-by: default avatarJay Satiro <raysatiro@yahoo.com>
parent 6bd5bc97

lib/imap.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -316,7 +316,7 @@ static bool imap_endofresp(struct connectdata *conn, char *line, size_t len, 
     a space and optionally some text as per RFC-3501 for the AUTHENTICATE and

     APPEND commands and as outlined in Section 4. Examples of RFC-4959 but

     some e-mail servers ignore this and only send a single + instead. */

  if(imap && !imap->custom && ((len == 3 && !memcmp("+", line, 1)) ||

  if(imap && !imap->custom && ((len == 3 && line[0] == '+') ||

     (len >= 2 && !memcmp("+ ", line, 2)))) {

    switch(imapc->state) {

      /* States which are interested in continuation responses */

lib/pop3.c

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -208,7 +208,7 @@ static bool pop3_endofresp(struct connectdata *conn, char *line, size_t len, 
  /* Are we processing CAPA command responses? */

  if(pop3c->state == POP3_CAPA) {

    /* Do we have the terminating line? */

    if(len >= 1 && !memcmp(line, ".", 1))

    if(len >= 1 && line[0] == '.')

      /* Treat the response as a success */

      *resp = '+';

    else
@@ -226,7 +226,7 @@ static bool pop3_endofresp(struct connectdata *conn, char *line, size_t len, 
  }



  /* Do we have a continuation response? */

  if(len >= 1 && !memcmp("+", line, 1)) {

  if(len >= 1 && line[0] == '+') {

    *resp = '*';



    return TRUE;