Commit f691f960 authored by Steve Holme's avatar Steve Holme
Browse files

email: Tidied up the *_regular_transfer() functions 

Added comments and simplified convoluted dophase_done comparison.
parent e5bb4e86

lib/imap.c

+4 −6
Original line number Diff line number Diff line
@@ -2222,20 +2222,18 @@ static CURLcode imap_regular_transfer(struct connectdata *conn, 
  /* Make sure size is unknown at this point */

  data->req.size = -1;



  /* Set the progress data */

  Curl_pgrsSetUploadCounter(data, 0);

  Curl_pgrsSetDownloadCounter(data, 0);

  Curl_pgrsSetUploadSize(data, 0);

  Curl_pgrsSetDownloadSize(data, 0);



  /* Carry out the perform */

  result = imap_perform(conn, &connected, dophase_done);



  if(!result) {

    if(!*dophase_done)

      /* The DO phase has not completed yet */

      return CURLE_OK;



  /* Perform post DO phase operations if necessary */

  if(!result && *dophase_done)

    result = imap_dophase_done(conn, connected);

  }



  return result;

}

lib/pop3.c

+4 −6
Original line number Diff line number Diff line
@@ -1594,20 +1594,18 @@ static CURLcode pop3_regular_transfer(struct connectdata *conn, 
  /* Make sure size is unknown at this point */

  data->req.size = -1;



  /* Set the progress data */

  Curl_pgrsSetUploadCounter(data, 0);

  Curl_pgrsSetDownloadCounter(data, 0);

  Curl_pgrsSetUploadSize(data, 0);

  Curl_pgrsSetDownloadSize(data, 0);



  /* Carry out the perform */

  result = pop3_perform(conn, &connected, dophase_done);



  if(!result) {

    if(!*dophase_done)

      /* The DO phase has not completed yet */

      return CURLE_OK;



  /* Perform post DO phase operations if necessary */

  if(!result && *dophase_done)

    result = pop3_dophase_done(conn, connected);

  }



  return result;

}

lib/smtp.c

+4 −6
Original line number Diff line number Diff line
@@ -1593,20 +1593,18 @@ static CURLcode smtp_regular_transfer(struct connectdata *conn, 
  /* Make sure size is unknown at this point */

  data->req.size = -1;



  /* Set the progress data */

  Curl_pgrsSetUploadCounter(data, 0);

  Curl_pgrsSetDownloadCounter(data, 0);

  Curl_pgrsSetUploadSize(data, 0);

  Curl_pgrsSetDownloadSize(data, 0);



  /* Carry out the perform */

  result = smtp_perform(conn, &connected, dophase_done);



  if(!result) {

    if(!*dophase_done)

      /* The DO phase has not completed yet */

      return CURLE_OK;



  /* Perform post DO phase operations if necessary */

  if(!result && *dophase_done)

    result = smtp_dophase_done(conn, connected);

  }



  return result;

}