remove unused functions

diff --git a/src/rename.c b/src/rename.c
index 97544adf1e1d734073573d9d0a1a334d342920ea..5b40d6bbcee56fe63af8ee85b9116de2375d694b 100644 (file)
--- a/src/rename.c
+++ b/src/rename.c
@@ -4,71 +4,39 @@
 
 #include "rename.h"
 
-uint8_t _replace_two_byte_wide_char(const char* wide_char, char* dst)
+char* replace(char** src, const char* pattern, const char* replace_str)
 {
-       switch (wide_char[1]) {
-       case WIDE_CHAR_a:
-               dst[0] = 'a';
-               dst[1] = 'e';
-               break;
-       case WIDE_CHAR_A:
-               dst[0] = 'A';
-               dst[1] = 'e';
-               break;
-       case WIDE_CHAR_o:
-               dst[0] = 'o';
-               dst[1] = 'e';
-               break;
-       case WIDE_CHAR_O:
-               dst[0] = 'O';
-               dst[1] = 'e';
-               break;
-       case WIDE_CHAR_u:
-               dst[0] = 'u';
-               dst[1] = 'e';
-               break;
-       case WIDE_CHAR_U:
-               dst[0] = 'U';
-               dst[1] = 'e';
-               break;
-       case WIDE_CHAR_SS:
-               dst[0] = 's';
-               dst[1] = 's';
-               break;
-       default:
-               dst[0] = wide_char[0];
-               dst[1] = wide_char[1];
-               break;
-       }
-
-       return 2;
-}
+       const size_t len = strlen(*src);
+       const size_t plen = strlen(pattern);
 
-uint8_t _replace_char(const char character, char* dest)
-{
-       switch (character) {
-       case SPACE:
-               *dest = '_';
-               break;
-       default:
-               *dest = character;
-               break;
+       uint32_t count = 0;
+       for (uint32_t i = 0; i < len; i++) {
+               if (strncmp(*src + i, pattern, plen) == 0)
+                       count++;
        }
 
-       return 1;
-}
+       const size_t rlen = strlen(replace_str);
+       const size_t difflen = count * (rlen - plen);
+       const size_t outlen = len + difflen + 1;
+       char* output = malloc(outlen);
+       if (output == NULL)
+               return NULL;
+       memset(output, 0, outlen);
 
-uint8_t wide_char_length(const char character)
-{
-       uint8_t count = 0;
-       for (uint8_t i = 7; i > 0; i--) {
-               if (character >> i & 1)
-                       count++;
-               else
-                       break;
+       uint32_t outi = 0;
+       for (uint32_t i = 0; i < len; i++) {
+               if (strncmp(*src + i, pattern, plen) == 0) {
+                       memcpy(&output[outi], replace_str, rlen);
+                       i += plen - 1;
+                       outi += rlen;
+               } else {
+                       output[outi++] = (*src)[i];
+               }
        }
 
-       return count;
+       free(*src);
+       *src = NULL;
+       return output;
 }
 
 void escape(const char* src, char* dst)
@@ -185,37 +153,3 @@ void rename_revert(const char* src, char* dst)
        }
 }
 
-char* replace(char** src, const char* pattern, const char* replace_str)
-{
-       const size_t len = strlen(*src);
-       const size_t plen = strlen(pattern);
-
-       uint32_t count = 0;
-       for (uint32_t i = 0; i < len; i++) {
-               if (strncmp(*src + i, pattern, plen) == 0)
-                       count++;
-       }
-
-       const size_t rlen = strlen(replace_str);
-       const size_t difflen = count * (rlen - plen);
-       const size_t outlen = len + difflen + 1;
-       char* output = malloc(outlen);
-       if (output == NULL)
-               return NULL;
-       memset(output, 0, outlen);
-
-       uint32_t outi = 0;
-       for (uint32_t i = 0; i < len; i++) {
-               if (strncmp(*src + i, pattern, plen) == 0) {
-                       memcpy(&output[outi], replace_str, rlen);
-                       i += plen - 1;
-                       outi += rlen;
-               } else {
-                       output[outi++] = (*src)[i];
-               }
-       }
-
-       free(*src);
-       *src = NULL;
-       return output;
-}
\ No newline at end of file

diff --git a/src/rename.h b/src/rename.h
index 8bab7ff5e74b66cc36e7da0c829f8e069bf283d7..db3e99b9811273773b16b3f65f2a1d93fec4a2ea 100644 (file)
--- a/src/rename.h
+++ b/src/rename.h
@@ -33,7 +33,6 @@
 
 typedef void (*rename_ptr)(const char* src, char* dst);
 
-uint8_t wide_char_length(const char character);
 void escape(const char* src, char* dst);
 void rename_point(const char* src, char* dst);
 void rename_lower(const char* src, char* dst);

diff --git a/tests/rename_tests.c b/tests/rename_tests.c
index 4b12af226bf4e33f49fc35812ee0476c37841d21..1b3b7b1395dd184b8ed6589c66213c60f2dc3c1e 100644 (file)
--- a/tests/rename_tests.c
+++ b/tests/rename_tests.c
@@ -231,42 +231,6 @@ void rename_revert_ss(void** state)
        assert_string_equal(output, "Gruß");
 }
 
-void no_wide_character()
-{
-       const char input = 0;
-
-       unsigned int length = wide_char_length(input);
-
-       assert_int_equal(length, 0);
-}
-
-void two_byte_wide_character()
-{
-       const char input = (char) 0x80;
-
-       unsigned int length = wide_char_length(input);
-
-       assert_int_equal(length, 1);
-}
-
-void three_byte_wide_character()
-{
-       const char input = (char) 0xc0;
-
-       unsigned int length = wide_char_length(input);
-
-       assert_int_equal(length, 2);
-}
-
-void four_byte_wide_character()
-{
-       const char input = (char) 0xe0;
-
-       unsigned int length = wide_char_length(input);
-
-       assert_int_equal(length, 3);
-}
-
 void replace_string()
 {
        char* input = malloc(sizeof(char) * 11);
@@ -305,10 +269,6 @@ int main()
                cmocka_unit_test_setup(rename_revert_ue, setup),
                cmocka_unit_test_setup(rename_revert_Ue, setup),
                cmocka_unit_test_setup(rename_revert_ss, setup),
-               cmocka_unit_test(no_wide_character),
-               cmocka_unit_test(two_byte_wide_character),
-               cmocka_unit_test(three_byte_wide_character),
-               cmocka_unit_test(four_byte_wide_character),
                cmocka_unit_test(replace_string)
        };