lexer,engine: use strlen(content) instead of length

I can't remember why I added length instead of using strlen(content). If
this breaks anything it would be a pain to debug. In my little testing
though, it seems to be working fine.

3 files changed, 3 insertions, 8 deletions

diff --git a/include/lexer.h b/include/lexer.h
index ae64759..f7a851a 100644
--- a/include/lexer.h
+++ b/include/lexer.h
@@ -46,11 +46,9 @@ typedef struct {
   void *operands;
 } directive_t;
 
-/* TODO: strlen(content) instead of length? */
 typedef struct {
   char *key;
   char *content;
-  size_t length;
 } contentfor_operand_t;
 
 typedef struct {
diff --git a/src/engine/contentfor.c b/src/engine/contentfor.c
index a30c3c8..76aae79 100644
--- a/src/engine/contentfor.c
+++ b/src/engine/contentfor.c
@@ -31,9 +31,8 @@ handle_contentfor(char **buffer,
                   list_t *content_headers)
 {
   contentfor_operand_t *operand = directive->operands;
-  contentfor_operand_t new_operand = { .content = strdup(operand->content),
-                                       .key = strdup(operand->key),
-                                       .length = operand->length };
+  contentfor_operand_t new_operand
+      = { .content = strdup(operand->content), .key = strdup(operand->key) };
   list_add(content_headers, &new_operand);
 
 #ifdef DEBUG
@@ -48,7 +47,7 @@ handle_contentfor(char **buffer,
            "%.*s%s",
            match->offset,
            temp_buffer,
-           temp_buffer + operand->length);
+           temp_buffer + strlen(operand->content));
 
   free(temp_buffer);
 }
diff --git a/src/lexer.c b/src/lexer.c
index 8947687..be5f8e6 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -191,8 +191,6 @@ lexer_handle_contentfor(directive_t *directive,
   }
 
   operands->content = strndup(buffer, new_match->offset);
-  operands->length
-      = match->offset + match->length + new_match->offset + new_match->length;
   free(new_match);
 
   directive->operands = operands;