From 0ce2bca741ae596a346b2ab767dfbf5be9bc7dae Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 16 Jan 2012 21:14:05 +0100 Subject: add LF termination to infof() trace string --- lib/connect.c | 4 ++-- lib/curl_ntlm_msgs.c | 4 ++-- lib/cyassl.c | 4 ++-- lib/dict.c | 6 +++--- lib/ftp.c | 6 +++--- lib/gtls.c | 4 ++-- lib/http_negotiate.c | 4 ++-- lib/transfer.c | 7 ++++--- lib/url.c | 4 ++-- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lib/connect.c b/lib/connect.c index bcd538406..f76ec0e0b 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -863,7 +863,7 @@ singleipconnect(struct connectdata *conn, return CURLE_OK; } memcpy(conn->ip_addr_str, conn->primary_ip, MAX_IPADR_LEN); - infof(data, " Trying %s... ", conn->ip_addr_str); + infof(data, " Trying %s...\n", conn->ip_addr_str); Curl_persistconninfo(conn); diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index 712c4b432..c88d98b28 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -695,7 +695,7 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data, /* Get the machine's un-qualified host name as NTLM doesn't like the fully qualified domain name */ if(Curl_gethostname(host, sizeof(host))) { - infof(data, "gethostname() failed, continuing without!"); + infof(data, "gethostname() failed, continuing without!\n"); hostlen = 0; } else { diff --git a/lib/cyassl.c b/lib/cyassl.c index afd008da3..31edcee06 100644 --- a/lib/cyassl.c +++ b/lib/cyassl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -258,7 +258,7 @@ cyassl_connect_step2(struct connectdata *conn, } conssl->connecting_state = ssl_connect_3; - infof(data, "SSL connected"); + infof(data, "SSL connected\n"); return CURLE_OK; } diff --git a/lib/dict.c b/lib/dict.c index 0fad32bfa..8c083736a 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -178,7 +178,7 @@ static CURLcode dict_do(struct connectdata *conn, bool *done) } if((word == NULL) || (*word == (char)0)) { - infof(data, "lookup word is missing"); + infof(data, "lookup word is missing\n"); word=(char *)"default"; } if((database == NULL) || (*database == (char)0)) { @@ -232,7 +232,7 @@ static CURLcode dict_do(struct connectdata *conn, bool *done) } if((word == NULL) || (*word == (char)0)) { - infof(data, "lookup word is missing"); + infof(data, "lookup word is missing\n"); word=(char *)"default"; } if((database == NULL) || (*database == (char)0)) { diff --git a/lib/ftp.c b/lib/ftp.c index 63a0463bd..106d5bc9d 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -427,7 +427,7 @@ static CURLcode ReceivedServerConnect(struct connectdata* conn, bool* received) /* First check whether there is a cached response from server */ if(pp->cache_size && pp->cache && pp->cache[0] > '3') { /* Data connection could not be established, let's return */ - infof(data, "There is negative response in cache while serv connect"); + infof(data, "There is negative response in cache while serv connect\n"); Curl_GetFTPResponse(&nread, conn, &ftpcode); return CURLE_FTP_ACCEPT_FAILED; } @@ -1153,7 +1153,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, * the control connection instead and restart the port loop */ - infof(data, "bind(port=%hu) on non-local address failed: %s", port, + infof(data, "bind(port=%hu) on non-local address failed: %s\n", port, Curl_strerror(conn, error) ); sslen = sizeof(ss); diff --git a/lib/gtls.c b/lib/gtls.c index a2e8d9931..f44fd7748 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -203,7 +203,7 @@ static void showtime(struct SessionHandle *data, tm->tm_hour, tm->tm_min, tm->tm_sec); - infof(data, "%s", data->state.buffer); + infof(data, "%s\n", data->state.buffer); } static gnutls_datum load_file (const char *file) diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index 4e68ab762..c03faf94d 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -124,7 +124,7 @@ log_gss_error(struct connectdata *conn, OM_uint32 error_status, gss_release_buffer(&min_stat, &status_string); } while(!GSS_ERROR(maj_stat) && msg_ctx != 0); - infof(conn->data, "%s", buf); + infof(conn->data, "%s\n", buf); } /* returning zero (0) means success, everything else is treated as "failure" diff --git a/lib/transfer.c b/lib/transfer.c index 9f05cfbd7..e293e8ba2 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -332,7 +332,7 @@ static void read_rewind(struct connectdata *conn, } DEBUGF(infof(conn->data, - "Buffer after stream rewind (read_pos = %zu): [%s]", + "Buffer after stream rewind (read_pos = %zu): [%s]\n", conn->read_pos, buf)); } #endif @@ -606,7 +606,8 @@ static CURLcode readwrite_data(struct SessionHandle *data, dataleft = conn->chunk.dataleft; if(dataleft != 0) { - infof(conn->data, "Leftovers after chunking: %zu bytes", dataleft); + infof(conn->data, "Leftovers after chunking: %zu bytes\n", + dataleft); if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) { /* only attempt the rewind if we truly are pipelining */ diff --git a/lib/url.c b/lib/url.c index 86a5576c8..d9dec701b 100644 --- a/lib/url.c +++ b/lib/url.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -3484,7 +3484,7 @@ static void fix_hostname(struct SessionHandle *data, host->name = host->encalloc; } #else - infof (data, "IDN support not present, can't parse Unicode domains"); + infof(data, "IDN support not present, can't parse Unicode domains\n"); #endif } } -- cgit v1.2.3