Add a chunk_from_str() initializer that does not include 0-terminator

[strongswan.git] / src / libstrongswan / utils / chunk.h

diff --git a/src/libstrongswan/utils/chunk.h b/src/libstrongswan/utils/chunk.h
index 865c1b8..bc14b73 100644 (file)
--- a/src/libstrongswan/utils/chunk.h
+++ b/src/libstrongswan/utils/chunk.h
@@ -42,7 +42,7 @@ struct chunk_t {
        size_t len;
 };
 
-#include "../utils.h"
+#include "utils.h"
 
 /**
  * A { NULL, 0 }-chunk handy for initialization.
@@ -191,6 +191,11 @@ static inline void chunk_clear(chunk_t *chunk)
 #define chunk_from_thing(thing) chunk_create((char*)&(thing), sizeof(thing))
 
 /**
+ * Initialize a chunk from a static string, not containing 0-terminator
+ */
+#define chunk_from_str(str) chunk_create(str, strlen(str))
+
+/**
  * Allocate a chunk on the heap
  */
 #define chunk_alloc(bytes) ({size_t x = (bytes); chunk_create(x ? malloc(x) : NULL, x);})