Merge a16fde8070 into 6f4b3b7cd8

debian/changelog

@@ -1,9 +1,3 @@
-libfastcommon (1.0.78-1) unstable; urgency=medium
-
-  * upgrade to 1.0.78-1
-
- -- YuQing <384681@qq.com>  Sat, 16 Aug 2025 16:31:05 +0000
-
 libfastcommon (1.0.77-1) unstable; urgency=medium
 
   * upgrade to 1.0.77-1

libfastcommon.spec

@@ -3,7 +3,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libfastcommon
-Version: 1.0.78
+Version: 1.0.77
 Release: 1%{?dist}
 Summary: c common functions library extracted from my open source projects FastDFS
 License: LGPL

src/shared_func.h

@@ -1378,100 +1378,6 @@ static inline int fc_get_hex_subdir_filepath(const char *base_path,
     return p - file_path;
 }
 
-static inline int fc_get_two_subdirs_full_filepath_ex(
-        const char *base_path, const int base_len,
-        const char *subdir_str1, const int subdir_len1,
-        const char *subdir_str2, const int subdir_len2,
-        char *file_path, const int size)
-{
-    char *p;
-
-    if (base_len + 1 + subdir_len1 + 1 + subdir_len2 >= size) {
-        return snprintf(file_path, size, "%s/%s/%s",
-                base_path, subdir_str1, subdir_str2);
-    }
-
-    memcpy(file_path, base_path, base_len);
-    p = file_path + base_len;
-    *p++ = '/';
-    memcpy(p, subdir_str1, subdir_len1);
-    p += subdir_len1;
-    *p++ = '/';
-    memcpy(p, subdir_str2, subdir_len2);
-    p += subdir_len2;
-    *p = '\0';
-    return p - file_path;
-}
-
-#define fc_get_two_subdirs_full_filepath(base_path, base_len,          \
-        subdir_str1, subdir_len1, subdir_str2, subdir_len2, file_path) \
-        fc_get_two_subdirs_full_filepath_ex(base_path, base_len,    \
-                subdir_str1, subdir_len1, subdir_str2, subdir_len2, \
-                file_path, sizeof(file_path))
-
-#define fc_get_one_subdir_full_filename_ex(base_path, base_len, subdir_str, \
-        subdir_len, filename_str, filename_len, full_filename, size)        \
-        fc_get_two_subdirs_full_filepath_ex(base_path, base_len,    \
-                subdir_str, subdir_len, filename_str, filename_len, \
-                full_filename, size)
-
-#define fc_get_one_subdir_full_filename(base_path, base_len, subdir_str, \
-        subdir_len, filename_str, filename_len, full_filename)      \
-        fc_get_one_subdir_full_filename_ex(base_path, base_len,     \
-                subdir_str, subdir_len, filename_str, filename_len, \
-                full_filename, sizeof(full_filename))
-
-static inline int fc_get_three_subdirs_full_filepath_ex(
-        const char *base_path, const int base_len,
-        const char *subdir_str1, const int subdir_len1,
-        const char *subdir_str2, const int subdir_len2,
-        const char *subdir_str3, const int subdir_len3,
-        char *file_path, const int size)
-{
-    char *p;
-
-    if (base_len + 1 + subdir_len1 + 1 + subdir_len2 + subdir_len3 >= size) {
-        return snprintf(file_path, size, "%s/%s/%s/%s",
-                base_path, subdir_str1, subdir_str2, subdir_str3);
-    }
-
-    memcpy(file_path, base_path, base_len);
-    p = file_path + base_len;
-    *p++ = '/';
-    memcpy(p, subdir_str1, subdir_len1);
-    p += subdir_len1;
-    *p++ = '/';
-    memcpy(p, subdir_str2, subdir_len2);
-    p += subdir_len2;
-    *p++ = '/';
-    memcpy(p, subdir_str3, subdir_len3);
-    p += subdir_len3;
-    *p = '\0';
-    return p - file_path;
-}
-
-#define fc_get_three_subdirs_full_filepath(base_path, base_len,  \
-        subdir_str1, subdir_len1, subdir_str2, subdir_len2,      \
-        subdir_str3, subdir_len3, file_path)  \
-        fc_get_three_subdirs_full_filepath_ex(base_path, base_len,     \
-                subdir_str1, subdir_len1, subdir_str2, subdir_len2,    \
-                subdir_str3, subdir_len3, file_path, sizeof(file_path))
-
-#define fc_get_two_subdirs_full_filename_ex(base_path, base_len, \
-        subdir_str1, subdir_len1, subdir_str2, subdir_len2,     \
-        filename_str, filename_len, full_filename, size)        \
-        fc_get_three_subdirs_full_filepath_ex(base_path, base_len,    \
-                subdir_str1, subdir_len1, subdir_str2, subdir_len2,   \
-                filename_str, filename_len, full_filename, size)
-
-#define fc_get_two_subdirs_full_filename(base_path, base_len,    \
-        subdir_str1, subdir_len1, subdir_str2, subdir_len2,     \
-        filename_str, filename_len, full_filename)              \
-        fc_get_two_subdirs_full_filename_ex(base_path, base_len, \
-        subdir_str1, subdir_len1, subdir_str2, subdir_len2,     \
-        filename_str, filename_len, full_filename, sizeof(full_filename))
-
-
 /** get gzip command full filename
  *  return: the gzip command full filename
 */