diff --git a/contrib/tablefunc/tablefunc.cpp b/contrib/tablefunc/tablefunc.cpp
index 9c484f0a81de8f7c4f532dd83c74f4febbec7585..4b1820995d4eaf75a094b7b9b3752f9b2f0333d3 100644
--- a/contrib/tablefunc/tablefunc.cpp
+++ b/contrib/tablefunc/tablefunc.cpp
@@ -105,7 +105,7 @@ typedef struct crosstab_cat_desc {
         char key[MAX_CATNAME_LEN] = {0};                                        \
         int rc = snprintf_s(key, MAX_CATNAME_LEN,                               \
                             MAX_CATNAME_LEN - 1, "%s", CATNAME);                \
-        securec_check_ss(rc, "", "");                                           \        
+        securec_check_ss_c(rc, "", "");                                           \        
         hentry = (crosstab_HashEnt*)hash_search(HASHTAB, key, HASH_FIND, NULL); \
         if (hentry)                                                             \
             CATDESC = hentry->catdesc;                                          \
@@ -120,7 +120,7 @@ typedef struct crosstab_cat_desc {
         char key[MAX_CATNAME_LEN] = {0};                                                            \
         int rc = snprintf_s(key, MAX_CATNAME_LEN,                                                   \
                             MAX_CATNAME_LEN - 1, "%s", CATDESC->catname);                           \
-        securec_check_ss(rc, "", "");                                           \        
+        securec_check_ss_c(rc, "", "");                                           \        
         hentry = (crosstab_HashEnt*)hash_search(HASHTAB, key, HASH_ENTER, &found);                  \
         if (found)                                                                                  \
             ereport(ERROR, (errcode(ERRCODE_DUPLICATE_OBJECT), errmsg("duplicate category name"))); \
@@ -1167,7 +1167,7 @@ static Tuplestorestate* build_tuplestore_recursively(char* key_fld, char* parent
 
         /* root level is 0 */
         rc = sprintf_s(current_level, INT32_STRLEN, "%d", level);
-        secure_check_ss(rc, "", "");
+        securec_check_ss_c(rc, "", "");
         values[2] = current_level;
 
         /* root branch is just starting root value */
@@ -1177,7 +1177,7 @@ static Tuplestorestate* build_tuplestore_recursively(char* key_fld, char* parent
         /* root starts the serial with 1 */
         if (show_serial) {
             rc = sprintf_s(serial_str, INT32_STRLEN, "%d", (*serial)++);
-            secure_check_ss(rc, "", "");
+            securec_check_ss_c(rc, "", "");
             if (show_branch)
                 values[4] = serial_str;
             else
@@ -1243,7 +1243,7 @@ static Tuplestorestate* build_tuplestore_recursively(char* key_fld, char* parent
 
             /* get the current level */
             rc = sprintf_s(current_level, INT32_STRLEN, "%d", level);
-            secure_check_ss(rc, "", "");
+            securec_check_ss_c(rc, "", "");
 
             /* check to see if this key is also an ancestor */
             if (strstr(chk_branchstr.data, chk_current_key.data))
@@ -1261,7 +1261,7 @@ static Tuplestorestate* build_tuplestore_recursively(char* key_fld, char* parent
                 values[3] = current_branch;
             if (show_serial) {
                 rc = sprintf_s(serial_str, INT32_STRLEN, "%d", (*serial)++);
-                secure_check_ss(rc, "", "");
+                securec_check_ss_c(rc, "", "");
                 if (show_branch)
                     values[4] = serial_str;
                 else