Merge in code changes for all of the new parser.

3 files changed, 10 insertions, 9 deletions

diff --git a/libhashkit/function.c b/libhashkit/function.c
index 2e68b583..a779bb63 100644
--- a/libhashkit/function.c
+++ b/libhashkit/function.c
@@ -51,9 +51,10 @@ static hashkit_return_t _set_function(struct hashkit_function_st *self, hashkit_
     self->function= hashkit_jenkins;
     break;    
   case HASHKIT_HASH_CUSTOM:
+    return HASHKIT_INVALID_ARGUMENT;
   case HASHKIT_HASH_MAX:
   default:
-    return HASHKIT_FAILURE;
+    return HASHKIT_INVALID_HASH;
   }
 
   self->context= NULL;
diff --git a/libhashkit/strerror.c b/libhashkit/strerror.c
index ac51f996..50532e1d 100644
--- a/libhashkit/strerror.c
+++ b/libhashkit/strerror.c
@@ -13,15 +13,13 @@ const char *hashkit_strerror(hashkit_st *ptr, hashkit_return_t rc)
   (void)ptr;
   switch (rc)
   {
-  case HASHKIT_SUCCESS:
-    return "SUCCESS";
-  case HASHKIT_FAILURE:
-    return "FAILURE";
-  case HASHKIT_MEMORY_ALLOCATION_FAILURE:
-    return "MEMORY ALLOCATION FAILURE";
+  case HASHKIT_SUCCESS: return "SUCCESS";
+  case HASHKIT_FAILURE: return "FAILURE";
+  case HASHKIT_MEMORY_ALLOCATION_FAILURE: return "MEMORY ALLOCATION FAILURE";
+  case HASHKIT_INVALID_ARGUMENT: return "INVALID ARGUMENT";
+  case HASHKIT_INVALID_HASH: return "INVALID hashkit_hash_algorithm_t";
   case HASHKIT_MAXIMUM_RETURN:
-    return "Gibberish returned!";
   default:
-    return "Gibberish returned!";
+    return "INVALID hashkit_return_t";
   }
 }
diff --git a/libhashkit/types.h b/libhashkit/types.h
index 8d396962..255620b8 100644
--- a/libhashkit/types.h
+++ b/libhashkit/types.h
@@ -19,6 +19,8 @@ typedef enum {
   HASHKIT_SUCCESS,
   HASHKIT_FAILURE,
   HASHKIT_MEMORY_ALLOCATION_FAILURE,
+  HASHKIT_INVALID_HASH,
+  HASHKIT_INVALID_ARGUMENT,
   HASHKIT_MAXIMUM_RETURN /* Always add new error code before */
 } hashkit_return_t;