X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspstring.h;h=2501b76ce85baf339f0ce70fab71626f65719af8;hb=384ef31bc01e4a1a2e59d082c9066002410ba54a;hp=6864245b0219e719e5eda500e913c41c53f3a569;hpb=712a0e5ff36e5ba052c5d1accf5f5943be4a6e8a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspstring.h b/include/inspstring.h
index 6864245b0..2501b76ce 100644
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -24,9 +24,32 @@
 #include "config.h"
 #include <cstring>
 
-/** Binary to hexadecimal conversion */
-CoreExport std::string BinToHex(const std::string& data);
+/** Sets ret to the formated string. last is the last parameter before ..., and format is the format in printf-style */
+#define VAFORMAT(ret, last, format) \
+	do { \
+	va_list _vaList; \
+	va_start(_vaList, last); \
+	ret.assign(InspIRCd::Format(_vaList, format)); \
+	va_end(_vaList); \
+	} while (false);
+
+/** Compose a hex string from raw data.
+ * @param raw The raw data to compose hex from (can be NULL if rawsize is 0)
+ * @param rawsize The size of the raw data buffer
+ * @return The hex string
+ */
+CoreExport std::string BinToHex(const void* raw, size_t rawsize);
+
 /** Base64 encode */
 CoreExport std::string BinToBase64(const std::string& data, const char* table = NULL, char pad = 0);
 /** Base64 decode */
 CoreExport std::string Base64ToBin(const std::string& data, const char* table = NULL);
+
+/** Compose a hex string from the data in a std::string.
+ * @param data The data to compose hex from
+ * @return The hex string.
+ */
+inline std::string BinToHex(const std::string& data)
+{
+	return BinToHex(data.data(), data.size());
+}