Refactor function names for consistency

- from "catcls_add_collations" to "catcls_add_collation" - from "catcls_add_charsets" to "catcls_add_charset"
CUBRID · Dec 26, 2024 · 673ec6f · 673ec6f
1 parent c85ac5c
commit 673ec6f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/executables/util_sa.c b/src/executables/util_sa.c
@@ -4313,7 +4313,7 @@ synccoll_force (void)
       return status;
     }
 
-  if (catcls_add_collations (class_mop) != NO_ERROR)
+  if (catcls_add_collation (class_mop) != NO_ERROR)
     {
       status = EXIT_FAILURE;
     }

diff --git a/src/object/schema_system_catalog.hpp b/src/object/schema_system_catalog.hpp
@@ -40,8 +40,8 @@ extern EXPORT_IMPORT bool sm_is_system_vclass (const std::string_view name);
 struct db_object;
 
 extern EXPORT_IMPORT int catcls_add_data_type (struct db_object *class_mop);
-extern EXPORT_IMPORT int catcls_add_charsets (struct db_object *class_mop);
-extern EXPORT_IMPORT int catcls_add_collations (struct db_object *class_mop);
+extern EXPORT_IMPORT int catcls_add_charset (struct db_object *class_mop);
+extern EXPORT_IMPORT int catcls_add_collation (struct db_object *class_mop);
 #endif
 
 #endif /* _SCHEMA_SYSTEM_CATALOG_HPP_ */
diff --git a/src/object/schema_system_catalog_install.cpp b/src/object/schema_system_catalog_install.cpp
@@ -86,7 +86,7 @@ catcls_add_data_type (struct db_object *class_mop)
 }
 
 int
-catcls_add_collations (struct db_object *class_mop)
+catcls_add_collation (struct db_object *class_mop)
 {
   int i;
   int count_collations;
@@ -151,7 +151,7 @@ catcls_add_collations (struct db_object *class_mop)
 }
 
 int
-catcls_add_charsets (struct db_object *class_mop)
+catcls_add_charset (struct db_object *class_mop)
 {
   int i;
   int count_collations;
@@ -1092,7 +1092,7 @@ namespace cubschema
       Au_dba_user, {}
     },
 // initializer
-    catcls_add_collations
+    catcls_add_collation
 	   );
 
 
@@ -1120,7 +1120,7 @@ namespace cubschema
       Au_dba_user, {}
     },
 // initializer
-    catcls_add_charsets
+    catcls_add_charset
 	   );