Refactored prival from string for performance

src/facility.c

@@ -46,12 +46,11 @@ stumpless_get_facility_enum_from_buffer(const char *facility_buffer, size_t faci
  size_t i;
  char *facility_name;
  const int str_offset = 19; // to ommit "STUMPLESS_FACILITY_"
- size_t buf_length;
 
  facility_bound = sizeof( facility_enum_to_string ) /
            sizeof( facility_enum_to_string[0] );
 
- facility_name = copy_cstring_with_length(facility_buffer, &buf_length);
+ facility_name = copy_cstring_length(facility_buffer, facility_buffer_length);
  if( !facility_name ) {
   return -1;
  }

src/prival.c

@@ -24,14 +24,14 @@
 #include <stumpless/prival.h>
 #include <stumpless/severity.h>
 #include <stumpless/facility.h>
+#include <stumpless/error.h>
 #include "private/config.h"
 #include "private/config/wrapper/locale.h"
 #include "private/error.h"
 #include "private/facility.h"
 #include "private/memory.h"
 #include "private/prival.h"
 #include "private/severity.h"
-#include "private/strhelper.h"
 #include "private/validate.h"
 
 const char *
@@ -64,7 +64,6 @@ stumpless_prival_from_string( const char *string ) {
   int prival;
   int severity;
   int facility;
-  const char *param;
   const char *period;
   const char *sec_period;
   size_t len;
@@ -103,15 +102,7 @@ stumpless_prival_from_string( const char *string ) {
   // Calculate the facility length, up to the first period character
   len = period - string;
 
-  // Copy the facility substring to the param buffer
-  param = copy_cstring_length( string, len );
-  if( !param ) {
-    return -1;
-  }
-
-  facility = stumpless_get_facility_enum( param );
-
-  free_mem( param );
+  facility = stumpless_get_facility_enum_from_buffer( string, len );
 
   if( facility < 0 ) {
     raise_invalid_param(  );
@@ -122,17 +113,9 @@ stumpless_prival_from_string( const char *string ) {
   len++;
   len = slen - len;
 
-  // Copy the severity substring to the param buffer
-  param = copy_cstring_length( period + 1, len );
-  if( !param ) {
-    return -1;
-  }
-
-  severity = stumpless_get_severity_enum( param );
-
-  free_mem( param );
+  severity = stumpless_get_severity_enum_from_buffer( period + 1, len );
 
-  if( severity < 0 ) {
+  if( severity < 0 && !stumpless_has_error()) {
     raise_invalid_param(  );
     return -1;
   }

src/severity.c

@@ -44,12 +44,11 @@ enum stumpless_severity stumpless_get_severity_enum_from_buffer(const char *seve
   size_t i;
   char *severity_name;
   const int str_offset = 19; // to ommit "STUMPLESS_SEVERITY_"
-  size_t buf_length;
 
   severity_bound = sizeof( severity_enum_to_string ) /
                      sizeof( severity_enum_to_string[0] );
 
-  severity_name = copy_cstring_with_length( severity_buffer, &buf_length );
+  severity_name = copy_cstring_length( severity_buffer, severity_buffer_length );
   if( !severity_name ) {
     return -1;
   }