Commit 60bd2262 authored by Steve Holme's avatar Steve Holme
Browse files

mprintf: Replaced internal usage of FORMAT_OFF_T and FORMAT_OFF_TU 

Following commit 0aafd77f, replaced the internal usage of
FORMAT_OFF_T and FORMAT_OFF_TU with the external versions that we
expect API programmers to use.

This negates the need for separate definitions which were subtly
different under different platforms/compilers.
parent 6e4d4a9b

lib/cookie.c

+2 −2
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ Curl_cookie_add(struct SessionHandle *data, 
  if(c->running)

    /* Only show this when NOT reading the cookies from a file */

    infof(data, "%s cookie %s=\"%s\" for domain %s, path %s, "

          "expire %" FORMAT_OFF_T "\n",

          "expire %" CURL_FORMAT_CURL_OFF_T "\n",

          replace_old?"Replaced":"Added", co->name, co->value,

          co->domain, co->path, co->expires);
@@ -1172,7 +1172,7 @@ static char *get_netscape_format(const struct Cookie *co) 
    "%s\t"   /* tailmatch */

    "%s\t"   /* path */

    "%s\t"   /* secure */

    "%" FORMAT_OFF_T "\t"   /* expires */

    "%" CURL_FORMAT_CURL_OFF_T "\t"   /* expires */

    "%s\t"   /* name */

    "%s",    /* value */

    co->httponly?"#HttpOnly_":"",

lib/curl_setup.h

+0 −23
Original line number Diff line number Diff line
@@ -139,29 +139,6 @@ 
   Error Compilation_aborted_SIZEOF_CURL_OFF_T_shall_not_be_defined

#endif



/*

 * Set up internal curl_off_t formatting string directives for

 * exclusive use with libcurl's internal *printf functions.

 */



#ifdef FORMAT_OFF_T

#  error "FORMAT_OFF_T shall not be defined before this point!"

   Error Compilation_aborted_FORMAT_OFF_T_already_defined

#endif



#ifdef FORMAT_OFF_TU

#  error "FORMAT_OFF_TU shall not be defined before this point!"

   Error Compilation_aborted_FORMAT_OFF_TU_already_defined

#endif



#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)

#  define FORMAT_OFF_T  "lld"

#  define FORMAT_OFF_TU "llu"

#else

#  define FORMAT_OFF_T  "ld"

#  define FORMAT_OFF_TU "lu"

#endif



/*

 * Disable other protocols when http is the only one desired.

 */

lib/file.c

+8 −7
Original line number Diff line number Diff line
@@ -152,14 +152,14 @@ static CURLcode file_range(struct connectdata *conn) 
    if((-1 == to) && (from>=0)) {

      /* X - */

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE %" FORMAT_OFF_T " to end of file\n",

      DEBUGF(infof(data, "RANGE %" CURL_FORMAT_CURL_OFF_T " to end of file\n",

                   from));

    }

    else if(from < 0) {

      /* -Y */

      data->req.maxdownload = -from;

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE the last %" FORMAT_OFF_T " bytes\n",

      DEBUGF(infof(data, "RANGE the last %" CURL_FORMAT_CURL_OFF_T " bytes\n",

                   -from));

    }

    else {
@@ -167,12 +167,13 @@ static CURLcode file_range(struct connectdata *conn) 
      totalsize = to-from;

      data->req.maxdownload = totalsize+1; /* include last byte */

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE from %" FORMAT_OFF_T

                   " getting %" FORMAT_OFF_T " bytes\n",

      DEBUGF(infof(data, "RANGE from %" CURL_FORMAT_CURL_OFF_T

                   " getting %" CURL_FORMAT_CURL_OFF_T " bytes\n",

                   from, data->req.maxdownload));

    }

    DEBUGF(infof(data, "range-download from %" FORMAT_OFF_T

                 " to %" FORMAT_OFF_T ", totally %" FORMAT_OFF_T " bytes\n",

    DEBUGF(infof(data, "range-download from %" CURL_FORMAT_CURL_OFF_T

                 " to %" CURL_FORMAT_CURL_OFF_T ", totally %"

                 CURL_FORMAT_CURL_OFF_T " bytes\n",

                 from, to, data->req.maxdownload));

  }

  else
@@ -465,7 +466,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done) 
  if(data->set.opt_no_body && data->set.include_header && fstated) {

    CURLcode result;

    snprintf(buf, sizeof(data->state.buffer),

             "Content-Length: %" FORMAT_OFF_T "\r\n", expected_size);

             "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", expected_size);

    result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0);

    if(result)

      return result;

lib/ftp.c

+26 −23
Original line number Diff line number Diff line
@@ -2263,8 +2263,8 @@ static CURLcode ftp_state_retr(struct connectdata *conn, 
      if(data->state.resume_from< 0) {

        /* We're supposed to download the last abs(from) bytes */

        if(filesize < -data->state.resume_from) {

          failf(data, "Offset (%" FORMAT_OFF_T

                ") was beyond file size (%" FORMAT_OFF_T ")",

          failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T

                ") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",

                data->state.resume_from, filesize);

          return CURLE_BAD_DOWNLOAD_RESUME;

        }
@@ -2275,8 +2275,8 @@ static CURLcode ftp_state_retr(struct connectdata *conn, 
      }

      else {

        if(filesize < data->state.resume_from) {

          failf(data, "Offset (%" FORMAT_OFF_T

                ") was beyond file size (%" FORMAT_OFF_T ")",

          failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T

                ") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",

                data->state.resume_from, filesize);

          return CURLE_BAD_DOWNLOAD_RESUME;

        }
@@ -2298,13 +2298,13 @@ static CURLcode ftp_state_retr(struct connectdata *conn, 
    }



    /* Set resume file transfer offset */

    infof(data, "Instructs server to resume from offset %" FORMAT_OFF_T

          "\n", data->state.resume_from);

    infof(data, "Instructs server to resume from offset %"

          CURL_FORMAT_CURL_OFF_T "\n", data->state.resume_from);



    PPSENDF(&ftpc->pp, "REST %" FORMAT_OFF_T, data->state.resume_from);

    PPSENDF(&ftpc->pp, "REST %" CURL_FORMAT_CURL_OFF_T,

            data->state.resume_from);



    state(conn, FTP_RETR_REST);



  }

  else {

    /* no resume */
@@ -2331,7 +2331,7 @@ static CURLcode ftp_state_size_resp(struct connectdata *conn, 
#ifdef CURL_FTP_HTTPSTYLE_HEAD

    if(-1 != filesize) {

      snprintf(buf, sizeof(data->state.buffer),

               "Content-Length: %" FORMAT_OFF_T "\r\n", filesize);

               "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", filesize);

      result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0);

      if(result)

        return result;
@@ -2508,10 +2508,12 @@ static CURLcode ftp_state_get_resp(struct connectdata *conn, 
    else if((instate != FTP_LIST) && (data->set.prefer_ascii))

      size = -1; /* kludge for servers that understate ASCII mode file size */



    infof(data, "Maxdownload = %" FORMAT_OFF_T "\n", data->req.maxdownload);

    infof(data, "Maxdownload = %" CURL_FORMAT_CURL_OFF_T "\n",

          data->req.maxdownload);



    if(instate != FTP_LIST)

      infof(data, "Getting file with size: %" FORMAT_OFF_T "\n", size);

      infof(data, "Getting file with size: %" CURL_FORMAT_CURL_OFF_T "\n",

            size);



    /* FTP download: */

    conn->proto.ftpc.state_saved = instate;
@@ -3367,8 +3369,8 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, 
       (data->set.infilesize != *ftp->bytecountp) &&

       !data->set.crlf &&

       (ftp->transfer == FTPTRANSFER_BODY)) {

      failf(data, "Uploaded unaligned file size (%" FORMAT_OFF_T

            " out of %" FORMAT_OFF_T " bytes)",

      failf(data, "Uploaded unaligned file size (%" CURL_FORMAT_CURL_OFF_T

            " out of %" CURL_FORMAT_CURL_OFF_T " bytes)",

            *ftp->bytecountp, data->set.infilesize);

      result = CURLE_PARTIAL_FILE;

    }
@@ -3385,8 +3387,8 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, 
        *ftp->bytecountp) &&

#endif /* CURL_DO_LINEEND_CONV */

       (data->req.maxdownload != *ftp->bytecountp)) {

      failf(data, "Received only partial file: %" FORMAT_OFF_T " bytes",

            *ftp->bytecountp);

      failf(data, "Received only partial file: %" CURL_FORMAT_CURL_OFF_T

            " bytes", *ftp->bytecountp);

      result = CURLE_PARTIAL_FILE;

    }

    else if(!ftpc->dont_check &&
@@ -3551,26 +3553,27 @@ static CURLcode ftp_range(struct connectdata *conn) 
    if((-1 == to) && (from>=0)) {

      /* X - */

      data->state.resume_from = from;

      DEBUGF(infof(conn->data, "FTP RANGE %" FORMAT_OFF_T " to end of file\n",

                   from));

      DEBUGF(infof(conn->data, "FTP RANGE %" CURL_FORMAT_CURL_OFF_T

                   " to end of file\n", from));

    }

    else if(from < 0) {

      /* -Y */

      data->req.maxdownload = -from;

      data->state.resume_from = from;

      DEBUGF(infof(conn->data, "FTP RANGE the last %" FORMAT_OFF_T " bytes\n",

                   -from));

      DEBUGF(infof(conn->data, "FTP RANGE the last %" CURL_FORMAT_CURL_OFF_T

                   " bytes\n", -from));

    }

    else {

      /* X-Y */

      data->req.maxdownload = (to-from)+1; /* include last byte */

      data->state.resume_from = from;

      DEBUGF(infof(conn->data, "FTP RANGE from %" FORMAT_OFF_T

                   " getting %" FORMAT_OFF_T " bytes\n",

      DEBUGF(infof(conn->data, "FTP RANGE from %" CURL_FORMAT_CURL_OFF_T

                   " getting %" CURL_FORMAT_CURL_OFF_T " bytes\n",

                   from, data->req.maxdownload));

    }

    DEBUGF(infof(conn->data, "range-download from %" FORMAT_OFF_T

                 " to %" FORMAT_OFF_T ", totally %" FORMAT_OFF_T " bytes\n",

    DEBUGF(infof(conn->data, "range-download from %" CURL_FORMAT_CURL_OFF_T

                 " to %" CURL_FORMAT_CURL_OFF_T ", totally %"

                 CURL_FORMAT_CURL_OFF_T " bytes\n",

                 from, to, data->req.maxdownload));

    ftpc->dont_check = TRUE; /* dont check for successful transfer */

  }

lib/http.c

+19 −19
Original line number Diff line number Diff line
@@ -414,8 +414,9 @@ static CURLcode http_perhapsrewind(struct connectdata *conn) 
        /* this is already marked to get closed */

        return CURLE_OK;



      infof(data, "NTLM send, close instead of sending %" FORMAT_OFF_T

            " bytes\n", (curl_off_t)(expectsend - bytessent));

      infof(data, "NTLM send, close instead of sending %"

            CURL_FORMAT_CURL_OFF_T " bytes\n",

            (curl_off_t)(expectsend - bytessent));

    }



    /* This is not NTLM or many bytes left to send: close
@@ -2018,9 +2019,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
            if((actuallyread == 0) || (actuallyread > readthisamountnow)) {

              /* this checks for greater-than only to make sure that the

                 CURL_READFUNC_ABORT return code still aborts */

              failf(data, "Could only read %" FORMAT_OFF_T

                    " bytes from the input",

                    passed);

              failf(data, "Could only read %" CURL_FORMAT_CURL_OFF_T

                    " bytes from the input", passed);

              return CURLE_READ_ERROR;

            }

          } while(passed < data->state.resume_from);
@@ -2065,8 +2065,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
           remote part so we tell the server (and act accordingly) that we

           upload the whole file (again) */

        conn->allocptr.rangeline =

          aprintf("Content-Range: bytes 0-%" FORMAT_OFF_T

                  "/%" FORMAT_OFF_T "\r\n",

          aprintf("Content-Range: bytes 0-%" CURL_FORMAT_CURL_OFF_T

                  "/%" CURL_FORMAT_CURL_OFF_T "\r\n",

                  data->set.infilesize - 1, data->set.infilesize);



      }
@@ -2075,8 +2075,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
        curl_off_t total_expected_size=

          data->state.resume_from + data->set.infilesize;

        conn->allocptr.rangeline =

          aprintf("Content-Range: bytes %s%" FORMAT_OFF_T

                  "/%" FORMAT_OFF_T "\r\n",

          aprintf("Content-Range: bytes %s%" CURL_FORMAT_CURL_OFF_T

                  "/%" CURL_FORMAT_CURL_OFF_T "\r\n",

                  data->state.range, total_expected_size-1,

                  total_expected_size);

      }
@@ -2084,7 +2084,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
        /* Range was selected and then we just pass the incoming range and

           append total size */

        conn->allocptr.rangeline =

          aprintf("Content-Range: bytes %s/%" FORMAT_OFF_T "\r\n",

          aprintf("Content-Range: bytes %s/%" CURL_FORMAT_CURL_OFF_T "\r\n",

                  data->state.range, data->set.infilesize);

      }

      if(!conn->allocptr.rangeline)
@@ -2294,8 +2294,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
       !Curl_checkheaders(data, "Content-Length:")) {

      /* only add Content-Length if not uploading chunked */

      result = Curl_add_bufferf(req_buffer,

                                "Content-Length: %" FORMAT_OFF_T "\r\n",

                                http->postsize);

                                "Content-Length: %" CURL_FORMAT_CURL_OFF_T

                                "\r\n", http->postsize);

      if(result)

        return result;

    }
@@ -2366,8 +2366,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
       !Curl_checkheaders(data, "Content-Length:")) {

      /* only add Content-Length if not uploading chunked */

      result = Curl_add_bufferf(req_buffer,

                                "Content-Length: %" FORMAT_OFF_T "\r\n",

                                postsize );

                                "Content-Length: %" CURL_FORMAT_CURL_OFF_T

                                "\r\n", postsize);

      if(result)

        return result;

    }
@@ -2417,8 +2417,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
        /* we allow replacing this header if not during auth negotiation,

           although it isn't very wise to actually set your own */

        result = Curl_add_bufferf(req_buffer,

                                  "Content-Length: %" FORMAT_OFF_T"\r\n",

                                  postsize);

                                  "Content-Length: %" CURL_FORMAT_CURL_OFF_T

                                  "\r\n", postsize);

        if(result)

          return result;

      }
@@ -2582,8 +2582,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
    if(http->writebytecount >= postsize) {

      /* already sent the entire request body, mark the "upload" as

         complete */

      infof(data, "upload completely sent off: %" FORMAT_OFF_T " out of "

            "%" FORMAT_OFF_T " bytes\n",

      infof(data, "upload completely sent off: %" CURL_FORMAT_CURL_OFF_T

            " out of %" CURL_FORMAT_CURL_OFF_T " bytes\n",

            http->writebytecount, postsize);

      data->req.upload_done = TRUE;

      data->req.keepon &= ~KEEP_SEND; /* we're done writing */
@@ -3233,7 +3233,7 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data, 
           happens for example when older Apache servers send large

           files */

        conn->bits.close = TRUE;

        infof(data, "Negative content-length: %" FORMAT_OFF_T

        infof(data, "Negative content-length: %" CURL_FORMAT_CURL_OFF_T

              ", closing after transfer\n", contentlength);

      }

    }