|
@@ -180,6 +180,7 @@ static bool is_separator(char c)
|
|
|
static CURLcode gskit_status(struct Curl_easy *data, int rc,
|
|
|
const char *procname, CURLcode defcode)
|
|
|
{
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
/* Process GSKit status and map it to a CURLcode. */
|
|
|
switch(rc) {
|
|
|
case GSK_OK:
|
|
@@ -208,7 +209,8 @@ static CURLcode gskit_status(struct Curl_easy *data, int rc,
|
|
|
case ENOMEM:
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
default:
|
|
|
- failf(data, "%s I/O error: %s", procname, strerror(errno));
|
|
|
+ failf(data, "%s I/O error: %s", procname,
|
|
|
+ Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
break;
|
|
|
}
|
|
|
break;
|
|
@@ -223,13 +225,15 @@ static CURLcode gskit_status(struct Curl_easy *data, int rc,
|
|
|
static CURLcode set_enum(struct Curl_easy *data, gsk_handle h,
|
|
|
GSK_ENUM_ID id, GSK_ENUM_VALUE value, bool unsupported_ok)
|
|
|
{
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
int rc = gsk_attribute_set_enum(h, id, value);
|
|
|
|
|
|
switch(rc) {
|
|
|
case GSK_OK:
|
|
|
return CURLE_OK;
|
|
|
case GSK_ERROR_IO:
|
|
|
- failf(data, "gsk_attribute_set_enum() I/O error: %s", strerror(errno));
|
|
|
+ failf(data, "gsk_attribute_set_enum() I/O error: %s",
|
|
|
+ Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
break;
|
|
|
case GSK_ATTRIBUTE_INVALID_ID:
|
|
|
if(unsupported_ok)
|
|
@@ -245,13 +249,15 @@ static CURLcode set_enum(struct Curl_easy *data, gsk_handle h,
|
|
|
static CURLcode set_buffer(struct Curl_easy *data, gsk_handle h,
|
|
|
GSK_BUF_ID id, const char *buffer, bool unsupported_ok)
|
|
|
{
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
int rc = gsk_attribute_set_buffer(h, id, buffer, 0);
|
|
|
|
|
|
switch(rc) {
|
|
|
case GSK_OK:
|
|
|
return CURLE_OK;
|
|
|
case GSK_ERROR_IO:
|
|
|
- failf(data, "gsk_attribute_set_buffer() I/O error: %s", strerror(errno));
|
|
|
+ failf(data, "gsk_attribute_set_buffer() I/O error: %s",
|
|
|
+ Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
break;
|
|
|
case GSK_ATTRIBUTE_INVALID_ID:
|
|
|
if(unsupported_ok)
|
|
@@ -267,6 +273,7 @@ static CURLcode set_buffer(struct Curl_easy *data, gsk_handle h,
|
|
|
static CURLcode set_numeric(struct Curl_easy *data,
|
|
|
gsk_handle h, GSK_NUM_ID id, int value)
|
|
|
{
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
int rc = gsk_attribute_set_numeric_value(h, id, value);
|
|
|
|
|
|
switch(rc) {
|
|
@@ -274,7 +281,7 @@ static CURLcode set_numeric(struct Curl_easy *data,
|
|
|
return CURLE_OK;
|
|
|
case GSK_ERROR_IO:
|
|
|
failf(data, "gsk_attribute_set_numeric_value() I/O error: %s",
|
|
|
- strerror(errno));
|
|
|
+ Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
break;
|
|
|
default:
|
|
|
failf(data, "gsk_attribute_set_numeric_value(): %s", gsk_strerror(rc));
|
|
@@ -287,13 +294,15 @@ static CURLcode set_numeric(struct Curl_easy *data,
|
|
|
static CURLcode set_callback(struct Curl_easy *data,
|
|
|
gsk_handle h, GSK_CALLBACK_ID id, void *info)
|
|
|
{
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
int rc = gsk_attribute_set_callback(h, id, info);
|
|
|
|
|
|
switch(rc) {
|
|
|
case GSK_OK:
|
|
|
return CURLE_OK;
|
|
|
case GSK_ERROR_IO:
|
|
|
- failf(data, "gsk_attribute_set_callback() I/O error: %s", strerror(errno));
|
|
|
+ failf(data, "gsk_attribute_set_callback() I/O error: %s",
|
|
|
+ Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
break;
|
|
|
default:
|
|
|
failf(data, "gsk_attribute_set_callback(): %s", gsk_strerror(rc));
|
|
@@ -966,7 +975,9 @@ static CURLcode gskit_connect_step2(struct Curl_easy *data,
|
|
|
continue; /* Retry. */
|
|
|
}
|
|
|
if(errno != ETIME) {
|
|
|
- failf(data, "QsoWaitForIOCompletion() I/O error: %s", strerror(errno));
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
+ failf(data, "QsoWaitForIOCompletion() I/O error: %s",
|
|
|
+ Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
cancel_async_handshake(conn, sockindex);
|
|
|
close_async_handshake(connssl);
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
@@ -1229,7 +1240,8 @@ static int gskit_shutdown(struct Curl_easy *data,
|
|
|
nread = read(conn->sock[sockindex], buf, sizeof(buf));
|
|
|
|
|
|
if(nread < 0) {
|
|
|
- failf(data, "read: %s", strerror(errno));
|
|
|
+ char buffer[STRERROR_LEN];
|
|
|
+ failf(data, "read: %s", Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
rc = -1;
|
|
|
}
|
|
|
|