aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/utils/parsing.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-09-19 22:16:20 -0400
committerJack Lloyd <[email protected]>2017-09-19 22:30:44 -0400
commitda5466639c474bea919aee1aefda76ed4625fe85 (patch)
tree90ca44fa2b8ed8e828d316886452e8c80d6f08ad /src/lib/utils/parsing.h
parent2f4b1610dc0b273c66c494e7bbef0116d9fd6511 (diff)
Complete the final annotation changes
Diffstat (limited to 'src/lib/utils/parsing.h')
-rw-r--r--src/lib/utils/parsing.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/lib/utils/parsing.h b/src/lib/utils/parsing.h
index 32236236e..fa340f410 100644
--- a/src/lib/utils/parsing.h
+++ b/src/lib/utils/parsing.h
@@ -57,9 +57,10 @@ BOTAN_PUBLIC_API(2,0) std::string erase_chars(const std::string& str, const std:
* @param to_char the character to replace it with
* @return str with all instances of from_char replaced by to_char
*/
-BOTAN_PUBLIC_API(2,0) std::string replace_char(const std::string& str,
- char from_char,
- char to_char);
+BOTAN_PUBLIC_API(2,0)
+std::string replace_char(const std::string& str,
+ char from_char,
+ char to_char);
/**
* Replace a character in a string
@@ -68,9 +69,10 @@ BOTAN_PUBLIC_API(2,0) std::string replace_char(const std::string& str,
* @param to_char the character to replace it with
* @return str with all instances of from_chars replaced by to_char
*/
-BOTAN_PUBLIC_API(2,0) std::string replace_chars(const std::string& str,
- const std::set<char>& from_chars,
- char to_char);
+BOTAN_PUBLIC_API(2,0)
+std::string replace_chars(const std::string& str,
+ const std::set<char>& from_chars,
+ char to_char);
/**
* Join a string
@@ -78,8 +80,9 @@ BOTAN_PUBLIC_API(2,0) std::string replace_chars(const std::string& str,
* @param delim the delimitor
* @return string joined by delim
*/
-BOTAN_PUBLIC_API(2,0) std::string string_join(const std::vector<std::string>& strs,
- char delim);
+BOTAN_PUBLIC_API(2,0)
+std::string string_join(const std::vector<std::string>& strs,
+ char delim);
/**
* Parse an ASN.1 OID
@@ -94,8 +97,9 @@ BOTAN_PUBLIC_API(2,0) std::vector<uint32_t> parse_asn1_oid(const std::string& oi
* @param name2 the second name
* @return true if name1 is the same as name2 by the X.509 comparison rules
*/
-BOTAN_PUBLIC_API(2,0) bool x500_name_cmp(const std::string& name1,
- const std::string& name2);
+BOTAN_PUBLIC_API(2,0)
+bool x500_name_cmp(const std::string& name1,
+ const std::string& name2);
/**
* Convert a string to a number
@@ -109,7 +113,7 @@ BOTAN_PUBLIC_API(2,0) uint32_t to_u32bit(const std::string& str);
* @param str the string to convert
* @return number value of the string
*/
-BOTAN_DLL uint16_t to_uint16(const std::string& str);
+BOTAN_PUBLIC_API(2,3) uint16_t to_uint16(const std::string& str);
/**
* Convert a time specification to a number