From 7af295b2ec22f06b24079bf895ac97079f64b6d7 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Thu, 9 Feb 2017 20:03:33 +0100
Subject: It's starting to "properly" reply...

The ACSL coverage is far behind though.
---
 src/core/char.c        | 25 +++++++++++++++++++++++--
 src/core/char.h        |  3 ++-
 src/core/state_types.h | 16 ----------------
 3 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 100644 src/core/state_types.h

(limited to 'src/core')

diff --git a/src/core/char.c b/src/core/char.c
index 819cd57..a6b3c8d 100644
--- a/src/core/char.c
+++ b/src/core/char.c
@@ -18,9 +18,30 @@ int ZoO_word_cmp
 (
    const ZoO_char word_a [const static 1],
    const size_t word_a_size,
-   const ZoO_char word_b [const static 1]
+   const ZoO_char word_b [const static 1],
+   const size_t word_b_size
 )
 {
-   return strncmp((const char *) word_a, (const char *) word_b, word_a_size);
+   int result;
+   size_t min_size;
+
+   if (word_a_size < word_b_size)
+   {
+      result =
+         strncmp((const char *) word_a, (const char *) word_b, word_a_size);
+
+      return (result == 0) ? -1 : result;
+   }
+   else if (word_b_size < word_a_size)
+   {
+      result =
+         strncmp((const char *) word_a, (const char *) word_b, word_b_size);
+
+      return (result == 0) ? 1 : result;
+   }
+   else
+   {
+      return strncmp((const char *) word_a, (const char *) word_b, word_a_size);
+   }
 }
 
diff --git a/src/core/char.h b/src/core/char.h
index 7039563..69606a0 100644
--- a/src/core/char.h
+++ b/src/core/char.h
@@ -13,7 +13,8 @@ int ZoO_word_cmp
 (
    const ZoO_char word_a [const static 1],
    const size_t word_a_size,
-   const ZoO_char word_b [const static 1]
+   const ZoO_char word_b [const static 1],
+   const size_t word_b_size
 );
 
 /*
diff --git a/src/core/state_types.h b/src/core/state_types.h
deleted file mode 100644
index 89c814e..0000000
--- a/src/core/state_types.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ZoO_CORE_STATE_TYPES_H_
-#define _ZoO_CORE_STATE_TYPES_H_
-
-#include "../io/parameters_types.h"
-#include "../io/network_types.h"
-
-#include "knowledge_types.h"
-
-struct ZoO_state
-{
-   struct ZoO_parameters param;
-   struct ZoO_knowledge knowledge;
-   struct ZoO_network network;
-};
-
-#endif
-- 
cgit v1.2.3-70-g09d2