1 files changed, 10 insertions, 8 deletions
diff --git a/include/quickmedia/NodeSearch.h b/include/quickmedia/NodeSearch.h
index adaac44..9e7fd0c 100644
--- a/include/quickmedia/NodeSearch.h
+++ b/include/quickmedia/NodeSearch.h
@@ -1,30 +1,32 @@
 #ifndef QUICKMEDIA_NODE_SEARCH_H
 #define QUICKMEDIA_NODE_SEARCH_H
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct {
-    char *name;
-    char *value;
+    const char *data;
+    size_t size;
+} QuickMediaStringView;
+
+typedef struct {
+    QuickMediaStringView name;
+    QuickMediaStringView value;
     int defined;
 } QuickMediaNodeSearchParam;
 
 typedef struct QuickMediaNodeSearch QuickMediaNodeSearch;
 
 struct QuickMediaNodeSearch {
-    char *name; /* optional */
+    QuickMediaStringView name; /* optional */
     int recursive;
     QuickMediaNodeSearchParam param; /* optional */
     QuickMediaNodeSearch *child; /* optional */
 };
 
-typedef struct {
-    const char *data;
-    unsigned long long size;
-} QuickMediaStringView;
-
 void quickmedia_node_search_param_init(QuickMediaNodeSearchParam *self);
 void quickmedia_node_search_init(QuickMediaNodeSearch *self);
 void quickmedia_node_search_deinit(QuickMediaNodeSearch *self);