aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-02-17 14:51:31 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-02-17 14:51:31 +0100
commit9ae7030cef96ae7777e95ca163644c40c20f61bb (patch)
tree7fffce4f7bb9d2c7c3327789677c4f2e71d2140f /docs
parenteb083e0d39990c8bdd1f7f1e1d12f7ae92240e73 (diff)
curlx.c: i2s_ASN1_IA5STRING() clashes with an openssl function
Reported-By: Gisle Vanem
Diffstat (limited to 'docs')
-rw-r--r--docs/examples/curlx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c
index 7cd523f7b..716fb0e19 100644
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -148,7 +148,7 @@ typedef struct sslctxparm_st {
/* some helper function. */
-static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5)
+static char *ia5string(ASN1_IA5STRING *ia5)
{
char *tmp;
if(!ia5 || !ia5->length)
@@ -160,7 +160,7 @@ static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5)
}
/* A conveniance routine to get an access URI. */
-static unsigned char *my_get_ext(X509 * cert, const int type,
+static unsigned char *my_get_ext(X509 *cert, const int type,
int extensiontype)
{
int i;
@@ -173,7 +173,7 @@ static unsigned char *my_get_ext(X509 * cert, const int type,
ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
if(OBJ_obj2nid(ad->method) == type) {
if(ad->location->type == GEN_URI) {
- return i2s_ASN1_IA5STRING(ad->location->d.ia5);
+ return ia5string(ad->location->d.ia5);
}
return NULL;
}