Renames utils/msc_string.[h|cc] to utils/string.[h|cc]

src/Makefile.am

@@ -211,19 +211,20 @@ OPERATORS = \
 
 
 UTILS = \
-        utils/acmp.cc \
-        utils/base64.cc \
-        utils/decode.cc \
-        utils/geo_lookup.cc \
-        utils/https_client.cc \
-        utils/ip_tree.cc \
-        utils/md5.cc \
-        utils/msc_string.cc \
-        utils/msc_tree.cc \
-        utils/random.cc \
-        utils/regex.cc \
-        utils/sha1.cc \
-        utils/system.cc
+	utils/acmp.cc \
+	utils/base64.cc \
+	utils/decode.cc \
+	utils/geo_lookup.cc \
+	utils/https_client.cc \
+	utils/ip_tree.cc \
+	utils/md5.cc \
+	utils/msc_tree.cc \
+	utils/random.cc \
+	utils/regex.cc \
+	utils/sha1.cc \
+	utils/string.cc \
+	utils/system.cc
+
 
 
 COLLECTION = \

src/actions/allow.cc

@@ -20,7 +20,7 @@
 
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 #include "modsecurity/modsecurity.h"
 
 

src/actions/ctl/rule_remove_target_by_id.cc

@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "modsecurity/transaction.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 using modsecurity::utils::String;
 

src/actions/ctl/rule_remove_target_by_tag.cc

@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "modsecurity/transaction.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 using modsecurity::utils::String;
 

src/actions/phase.cc

@@ -21,7 +21,7 @@
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "modsecurity/modsecurity.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/actions/set_var.cc

@@ -21,7 +21,7 @@
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 using modsecurity::utils::String;
 

src/actions/severity.cc

@@ -21,7 +21,7 @@
 #include "src/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 #include "modsecurity/rule_message.h"
 
 

src/actions/transformations/css_decode.cc

@@ -26,7 +26,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 namespace modsecurity {

src/actions/transformations/escape_seq_decode.cc

@@ -25,7 +25,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/transformations/hex_decode.cc

@@ -25,7 +25,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/transformations/html_entity_decode.h

@@ -18,7 +18,7 @@
 
 #include "src/actions/action.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_

src/actions/transformations/js_decode.cc

@@ -26,7 +26,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 namespace modsecurity {

src/actions/transformations/sql_hex_decode.cc

@@ -25,7 +25,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 namespace modsecurity {

src/actions/transformations/url_decode_uni.cc

@@ -27,7 +27,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 #include "modsecurity/rules.h"
 
 namespace modsecurity {

src/actions/transformations/url_encode.cc

@@ -24,7 +24,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/transformations/utf8_to_unicode.cc

@@ -25,7 +25,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 namespace modsecurity {

src/collection/backend/in_memory-per_process.cc

@@ -25,7 +25,7 @@
 
 #include "modsecurity/collection/variable.h"
 #include "src/utils/regex.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/collection/collections.cc

@@ -27,7 +27,7 @@
 #include "modsecurity/collection/variable.h"
 #include "modsecurity/collection/collection.h"
 #include "src/collection/backend/in_memory-per_process.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/macro_expansion.cc

@@ -19,7 +19,7 @@
 #include "src/variables/rule.h"
 #include "src/variables/tx.h"
 #include "src/variables/highest_severity.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/parser/seclang-parser.yy

@@ -55,7 +55,7 @@ class Driver;
 #include "modsecurity/rule.h"
 #include "src/operators/operator.h"
 #include "src/utils/geo_lookup.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 #include "src/utils/system.h"
 #include "src/variables/xml.h"
 #include "src/variables/duration.h"

src/parser/seclang-scanner.ll

@@ -7,7 +7,7 @@
 #include "src/parser/driver.h"
 #include "src/parser/seclang-parser.hh"
 #include "src/utils/https_client.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 using modsecurity::Parser::Driver;
 using modsecurity::Utils::HttpsClient;

src/request_body_processor/multipart.cc

@@ -28,7 +28,7 @@
 
 #include "modsecurity/collection/collections.h"
 #include "modsecurity/rules.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/rule.cc

@@ -30,7 +30,7 @@
 #include "src/actions/transformations/none.h"
 #include "src/actions/tag.h"
 #include "src/variables/variations/exclusion.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 #include "modsecurity/rules.h"
 #include "modsecurity/rule_message.h"
 #include "src/macro_expansion.h"

src/rule_message.cc

@@ -19,7 +19,7 @@
 
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/transaction.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 namespace modsecurity {
 

src/rules_exceptions.cc

@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/transaction.cc

@@ -41,7 +41,7 @@
 #include "src/request_body_processor/json.h"
 #include "src/audit_log/audit_log.h"
 #include "src/unique_id.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 #include "src/utils/system.h"
 #include "src/utils/decode.h"
 #include "src/utils/random.h"

src/utils/decode.cc

@@ -15,7 +15,7 @@
 
 #include "src/utils/decode.h"
 #include "modsecurity/modsecurity.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 namespace modsecurity {

src/utils/decode.h

@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "modsecurity/modsecurity.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 #ifndef SRC_UTILS_DECODE_H_
 #define SRC_UTILS_DECODE_H_

src/utils/string.cc

@@ -39,7 +39,7 @@
 
 #include "modsecurity/modsecurity.h"
 
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 namespace modsecurity {

src/variables/rule.cc

@@ -44,7 +44,7 @@
 #include "src/actions/xmlns.h"
 #include "src/actions/log_data.h"
 #include "src/actions/msg.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

src/variables/variable.cc

@@ -22,7 +22,7 @@
 
 #include "modsecurity/transaction.h"
 #include "src/variables/variations/exclusion.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

test/unit/unit.cc

@@ -28,7 +28,7 @@
 #include "test/common/modsecurity_test_results.h"
 #include "test/common/colors.h"
 #include "test/unit/unit_test.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;

test/unit/unit_test.cc

@@ -24,7 +24,7 @@
 
 #include "test/common/colors.h"
 #include "src/utils/regex.h"
-#include "src/utils/msc_string.h"
+#include "src/utils/string.h"
 
 
 using modsecurity::utils::String;