From ed6466d17603aa39bb4b1685544747f4c64ec7b0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 15 Jan 2008 23:19:02 +0000 Subject: Calls to Curl_failf() are not supposed to provide a trailing newline as the function itself adds that. Fixed on 50 or something strings! --- lib/nss.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/nss.c') diff --git a/lib/nss.c b/lib/nss.c index dcf955b15..b8f2ddd5c 100644 --- a/lib/nss.c +++ b/lib/nss.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -436,10 +436,10 @@ static int display_error(struct connectdata *conn, PRInt32 err, { switch(err) { case SEC_ERROR_BAD_PASSWORD: - failf(conn->data, "Unable to load client key: Incorrect password\n"); + failf(conn->data, "Unable to load client key: Incorrect password"); return 1; case SEC_ERROR_UNKNOWN_CERT: - failf(conn->data, "Unable to load certificate %s\n", filename); + failf(conn->data, "Unable to load certificate %s", filename); return 1; default: break; @@ -521,10 +521,10 @@ static SECStatus nss_Init_Tokens(struct connectdata * conn) if(PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) { if(slot == PK11_GetInternalKeySlot()) { - failf(conn->data, "The NSS database has not been initialized.\n"); + failf(conn->data, "The NSS database has not been initialized"); } else { - failf(conn->data, "The token %s has not been initialized.", + failf(conn->data, "The token %s has not been initialized", PK11_GetTokenName(slot)); } PK11_FreeSlot(slot); @@ -1057,7 +1057,7 @@ int Curl_nss_send(struct connectdata *conn, /* connection data */ return CURLE_OPERATION_TIMEDOUT; } - failf(conn->data, "SSL write: error %d\n", err); + failf(conn->data, "SSL write: error %d", err); return -1; } return rc; /* number of bytes */ -- cgit v1.2.3