Commit e1922617 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

failf() calls should not have newlines in the message string!

parent c63ca99c

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static CURLcode bindlocal(struct connectdata *conn, 
            failf(data, "Insufficient kernel memory was available: %d", errno);

            break;

          default:

            failf(data, "errno %d\n", errno);

            failf(data, "errno %d", errno);

            break;

          } /* end of switch(errno) */

lib/dict.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ CURLcode Curl_dict(struct connectdata *conn) 
    }

      

    if ((word == NULL) || (*word == (char)0)) {

      failf(data, "lookup word is missing\n");

      failf(data, "lookup word is missing");

    }

    if ((database == NULL) || (*database == (char)0)) {

      database = (char *)"!";
@@ -174,7 +174,7 @@ CURLcode Curl_dict(struct connectdata *conn) 
    }

      

    if ((word == NULL) || (*word == (char)0)) {

      failf(data, "lookup word is missing\n");

      failf(data, "lookup word is missing");

    }

    if ((database == NULL) || (*database == (char)0)) {

      database = (char *)"!";

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ CURLcode ftp_perform(struct connectdata *conn) 


          passed += actuallyread;

          if(actuallyread != readthisamountnow) {

            failf(data, "Could only read %d bytes from the input\n", passed);

            failf(data, "Could only read %d bytes from the input", passed);

            return CURLE_FTP_COULDNT_USE_REST;

          }

        }

lib/http.c

+5 −5
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ CURLcode Curl_http_done(struct connectdata *conn) 
  if(0 == (http->readbytecount + conn->headerbytecount)) {

    /* nothing was read from the HTTP server, this can't be right

       so we return an error here */

    failf(data, "Empty reply from server\n");

    failf(data, "Empty reply from server");

    return CURLE_GOT_NOTHING;

  }
@@ -610,7 +610,7 @@ CURLcode Curl_http(struct connectdata *conn) 


        passed += actuallyread;

        if(actuallyread != readthisamountnow) {

          failf(data, "Could only read %d bytes from the input\n",

          failf(data, "Could only read %d bytes from the input",

                passed);

          return CURLE_READ_ERROR;

        }
@@ -621,7 +621,7 @@ CURLcode Curl_http(struct connectdata *conn) 
        data->set.infilesize -= conn->resume_from;



        if(data->set.infilesize <= 0) {

          failf(data, "File already completely uploaded\n");

          failf(data, "File already completely uploaded");

          return CURLE_PARTIAL_FILE;

        }

      }
@@ -793,7 +793,7 @@ CURLcode Curl_http(struct connectdata *conn) 
      char contentType[256];

      int linelength=0;

      if(Curl_FormInit(&http->form, http->sendit)) {

        failf(data, "Internal HTTP POST error!\n");

        failf(data, "Internal HTTP POST error!");

        return CURLE_HTTP_POST_ERROR;

      }
@@ -824,7 +824,7 @@ CURLcode Curl_http(struct connectdata *conn) 
                                           1,

                                           (FILE *)&http->form);

        if(linelength == -1) {

          failf(data, "Could not get Content-Type header line!\n");

          failf(data, "Could not get Content-Type header line!");

          return CURLE_HTTP_POST_ERROR;

        }

        add_buffer(req_buffer, contentType, linelength);

lib/krb4.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ void Curl_krb_kauth(struct connectdata *conn) 
  memset(schedule, 0, sizeof(schedule));

  memset(passwd, 0, sizeof(passwd));

  if(Curl_base64_encode(tktcopy.dat, tktcopy.length, &p) < 0) {

    failf(conn->data, "Out of memory base64-encoding.\n");

    failf(conn->data, "Out of memory base64-encoding.");

    Curl_set_command_prot(conn, save);

    return;

  }