Merge pull request #503 from RealBadAngel/master

[minetest.git] / src / hex.h

diff --git a/src/hex.h b/src/hex.h
index 1afb8759716f2a373d8fe61af10c5ee785a45b96..e54ef96344bde4f745683eadc3820317cc8ef365 100644 (file)
--- a/src/hex.h
+++ b/src/hex.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2012 Jonathan Neuschäfer <j.neuschaefer@gmx.net>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 static const char hex_chars[] = "0123456789abcdef";
 
-static std::string hex_encode(const char *data, unsigned int data_size)
+static inline std::string hex_encode(const char *data, unsigned int data_size)
 {
        std::string ret;
        char buf2[3];
@@ -41,4 +41,9 @@ static std::string hex_encode(const char *data, unsigned int data_size)
        return ret;
 }
 
+static inline std::string hex_encode(const std::string &data)
+{
+    return hex_encode(data.c_str(), data.size());
+}
+
 #endif