[REFACTOR] [Hacker Rank] Warmup: Time Conversion solved ✅. Trying to solve sonarcloud warnings.

Author: Gonzalo Diaz

src/lib/exercises/include/exercises/hackerrank/warmup/time_conversion.h

@@ -6,8 +6,6 @@ extern "C" {
 
 char *HACKERRANK_WARMUP_getStringFragment(const char *s, unsigned long len,
                                           unsigned long from, unsigned long to);
-char *HACKERRANK_WARMUP_getFirst(const char *s, unsigned long n);
-char *HACKERRANK_WARMUP_getLast(const char *s, unsigned long n);
 
 char *HACKERRANK_WARMUP_timeConversion(const char *s);
 

src/lib/exercises/src/hackerrank/warmup/time_conversion.c

@@ -10,23 +10,6 @@
 
 #define HACKERRANK_WARMUP_MAX_STRING_SIZE 10
 
-char *HACKERRANK_WARMUP_getFirst(const char *s, unsigned long n) {
-  char dest[HACKERRANK_WARMUP_MAX_STRING_SIZE + 1];
-  dest[sizeof dest - 1] = 0;
-  strncpy(dest, s, sizeof dest);
-  if (dest[sizeof dest - 1] != 0) {
-    return NULL; // Handle error
-  }
-  size_t s_len = strlen(s);
-
-  return HACKERRANK_WARMUP_getStringFragment(s, s_len, 0, n);
-}
-
-char *HACKERRANK_WARMUP_getLast(const char *s, unsigned long n) {
-  unsigned long len = strlen(s);
-  return HACKERRANK_WARMUP_getStringFragment(s, len, len - n, n);
-}
-
 char *HACKERRANK_WARMUP_getStringFragment(const char *s, unsigned long len,
                                           unsigned long from,
                                           unsigned long to) {
@@ -54,10 +37,10 @@ char *HACKERRANK_WARMUP_timeConversion(const char *s) {
     return NULL;
   }
 
-  char *meridian = HACKERRANK_WARMUP_getLast(s, 2);
-  char *hour_str = HACKERRANK_WARMUP_getFirst(s, 2);
-
   size_t s_len = strlen(s);
+  char *meridian = HACKERRANK_WARMUP_getStringFragment(s, s_len, s_len - 2, 2);
+  char *hour_str = HACKERRANK_WARMUP_getStringFragment(s, s_len, 0, 2);
+
   char *time_str = malloc(s_len + 1);
   if (time_str == NULL) {
     free(meridian);
@@ -68,11 +51,13 @@ char *HACKERRANK_WARMUP_timeConversion(const char *s) {
   strncpy(time_str, s, s_len + 1);
   char *temp_time_str;
   unsigned long time_str_len = strlen(time_str);
-  temp_time_str = HACKERRANK_WARMUP_getLast(time_str, time_str_len - 2);
+  temp_time_str = HACKERRANK_WARMUP_getStringFragment(time_str, time_str_len, 2,
+                                                      time_str_len);
   strncpy(time_str, temp_time_str, time_str_len - 2);
   time_str[time_str_len - 2] = '\0';
   free(temp_time_str);
-  temp_time_str = HACKERRANK_WARMUP_getFirst(time_str, time_str_len - 2);
+  temp_time_str = HACKERRANK_WARMUP_getStringFragment(time_str, time_str_len, 0,
+                                                      time_str_len - 2);
   strncpy(time_str, temp_time_str, time_str_len - 2);
   time_str[time_str_len - 2] = '\0';
   free(temp_time_str);

src/tests/unit/lib/hackerrank/warmup/time_conversion.test.cpp

@@ -34,15 +34,14 @@ TEST_CASE("time_conversion JSON Test Cases",
 
 TEST_CASE("time_conversion helper functions edge cases",
           "[hackerrank] [helper] [warmup]") {
-  // CHECK(HACKERRANK_WARMUP_getFirst(nullptr, 0) == nullptr);
+  CHECK(HACKERRANK_WARMUP_getStringFragment("", 0, 0, 10) == nullptr);
 
-  CHECK(HACKERRANK_WARMUP_getFirst("", 10) == nullptr);
-  CHECK(HACKERRANK_WARMUP_getLast("", 10) == nullptr);
-
-  CHECK(HACKERRANK_WARMUP_getFirst("", 0) == nullptr);
-  CHECK(HACKERRANK_WARMUP_getLast("", 0) == nullptr);
+  CHECK(HACKERRANK_WARMUP_getStringFragment("", 0, 0, 0) == nullptr);
+  CHECK(HACKERRANK_WARMUP_getStringFragment(nullptr, 0, 0, 0) == nullptr);
 }
 
 TEST_CASE("time_conversion edge cases", "[hackerrank] [helper] [warmup]") {
+  CHECK(HACKERRANK_WARMUP_timeConversion(nullptr) == nullptr);
+
   CHECK(HACKERRANK_WARMUP_timeConversion("aa:bb:ccXM") == nullptr);
 }