aboutsummaryrefslogtreecommitdiff
path: root/lib/escape.h
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2012-01-26 16:39:53 +0100
committerPierre Joye <pierre.php@gmail.com>2012-01-26 16:39:53 +0100
commit8ee2576b6fcc8aee0c768255a55e255a1868b609 (patch)
tree41dbe761ce20a76f3168257800bba199ed77ec47 /lib/escape.h
parent575f3c30ed60aafddbaeeb26745cca942fb9ee2f (diff)
parentcf9fb08ca4537d76afde44daf1e92307fe2882d3 (diff)
Merge branch 'master' of github.com:bagder/curl
Diffstat (limited to 'lib/escape.h')
-rw-r--r--lib/escape.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/escape.h b/lib/escape.h
index 04b06a973..4c7f84133 100644
--- a/lib/escape.h
+++ b/lib/escape.h
@@ -1,5 +1,5 @@
-#ifndef __ESCAPE_H
-#define __ESCAPE_H
+#ifndef HEADER_CURL_ESCAPE_H
+#define HEADER_CURL_ESCAPE_H
/***************************************************************************
* _ _ ____ _
@@ -8,7 +8,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -25,5 +25,9 @@
/* Escape and unescape URL encoding in strings. The functions return a new
* allocated string or NULL if an error occurred. */
+CURLcode Curl_urldecode(struct SessionHandle *data,
+ const char *string, size_t length,
+ char **ostring, size_t *olen,
+ bool reject_crlf);
#endif