generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add LF termination to infof() trace string

Browse Source
This commit is contained in:
Yang Tse
2012-01-16 21:14:05 +01:00
parent b15024be4d
commit 0ce2bca741
9 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/connect.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@@ -863,7 +863,7 @@ singleipconnect(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
memcpy(conn->ip_addr_str, conn->primary_ip, MAX_IPADR_LEN); 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); Curl_persistconninfo(conn);

4
lib/curl_ntlm_msgs.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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 /* Get the machine's un-qualified host name as NTLM doesn't like the fully
qualified domain name */ qualified domain name */
if(Curl_gethostname(host, sizeof(host))) { if(Curl_gethostname(host, sizeof(host))) {
infof(data, "gethostname() failed, continuing without!"); infof(data, "gethostname() failed, continuing without!\n");
hostlen = 0; hostlen = 0;
} }
else { else {

4
lib/cyassl.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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; conssl->connecting_state = ssl_connect_3;
infof(data, "SSL connected"); infof(data, "SSL connected\n");
return CURLE_OK; return CURLE_OK;
} }

6
lib/dict.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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)) { if((word == NULL) || (*word == (char)0)) {
infof(data, "lookup word is missing"); infof(data, "lookup word is missing\n");
word=(char *)"default"; word=(char *)"default";
} }
if((database == NULL) || (*database == (char)0)) { 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)) { if((word == NULL) || (*word == (char)0)) {
infof(data, "lookup word is missing"); infof(data, "lookup word is missing\n");
word=(char *)"default"; word=(char *)"default";
} }
if((database == NULL) || (*database == (char)0)) { if((database == NULL) || (*database == (char)0)) {

6
lib/ftp.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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 */ /* First check whether there is a cached response from server */
if(pp->cache_size && pp->cache && pp->cache[0] > '3') { if(pp->cache_size && pp->cache && pp->cache[0] > '3') {
/* Data connection could not be established, let's return */ /* 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); Curl_GetFTPResponse(&nread, conn, &ftpcode);
return CURLE_FTP_ACCEPT_FAILED; 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 * 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) ); Curl_strerror(conn, error) );
sslen = sizeof(ss); sslen = sizeof(ss);

4
lib/gtls.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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_hour,
tm->tm_min, tm->tm_min,
tm->tm_sec); tm->tm_sec);
infof(data, "%s", data->state.buffer); infof(data, "%s\n", data->state.buffer);
} }
static gnutls_datum load_file (const char *file) static gnutls_datum load_file (const char *file)

4
lib/http_negotiate.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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); gss_release_buffer(&min_stat, &status_string);
} while(!GSS_ERROR(maj_stat) && msg_ctx != 0); } 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" /* returning zero (0) means success, everything else is treated as "failure"

7
lib/transfer.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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, 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)); conn->read_pos, buf));
} }
#endif #endif
@@ -606,7 +606,8 @@ static CURLcode readwrite_data(struct SessionHandle *data,
dataleft = conn->chunk.dataleft; dataleft = conn->chunk.dataleft;
if(dataleft != 0) { 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 && if(conn->data->multi &&
Curl_multi_canPipeline(conn->data->multi)) { Curl_multi_canPipeline(conn->data->multi)) {
/* only attempt the rewind if we truly are pipelining */ /* only attempt the rewind if we truly are pipelining */

4
lib/url.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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; host->name = host->encalloc;
} }
#else #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 #endif
} }
} }