全部使用 xy_strcat() 弃用 xy_strjoin()

Author: ccmywish

lib/xy.h

@@ -264,8 +264,6 @@ xy_2strcat (const char *str1, const char *str2)
   return ret;
 }
 
-/* @deprecated 应迁移到后者 */
-#define xy_2strjoin xy_2strcat
 
 /**
  * @brief 将多个字符串连接成一个字符串
@@ -336,9 +334,6 @@ xy_strcat (unsigned int count, ...)
   return ret;
 }
 
-/* @deprecated 应迁移到后者 */
-#define xy_strjoin xy_strcat
-
 
 /**
  * @brief 复制一个字符串，返回复制的新字符串

src/chsrc-main.c

@@ -64,7 +64,7 @@ cli_print_available_mirrors ()
 {
   {
   char *msg = ENGLISH ? "To specify a source, use chsrc set " : "指定使用某源，请使用 chsrc set ";
-  say (bdblue(xy_strjoin (3, msg, "<target>", " <code>\n")));
+  say (bdblue(xy_strcat (3, msg, "<target>", " <code>\n")));
   }
 
   {
@@ -246,28 +246,28 @@ cli_print_target_features (Target_t *target, const char *input_target_name)
 
   {
   char *msg = ENGLISH ? " Get: View the current source state " : " Get: 查看当前源状态 ";
-  char *get_msg = xy_strjoin (3, msg, "| chsrc get ", input_target_name);
+  char *get_msg = xy_strcat (3, msg, "| chsrc get ", input_target_name);
   if (target->getfn != NULL) printf (" %s%s\n", bdgreen(YesMark), purple(get_msg));
   else printf (" %s%s\n", bdred(NoMark), get_msg);br();
   }
 
   {
   char *msg = ENGLISH ? " Reset: Reset to the default source " : " Reset: 重置回默认源 ";
-  char *reset_msg = xy_strjoin (3, msg, "| chsrc reset ", input_target_name);
+  char *reset_msg = xy_strcat (3, msg, "| chsrc reset ", input_target_name);
   if (target->resetfn != NULL) printf (" %s%s\n", bdgreen(YesMark), purple(reset_msg));
   else printf (" %s%s\n", bdred(NoMark), reset_msg);br();
   }
 
   {
   char *msg = ENGLISH ? " UserDefine: using user-defined source URL " : " UserDefine: 用户自定义换源URL ";
-  char *user_define_msg = xy_strjoin (5, msg, "| chsrc set ", input_target_name, " https://user-define-url.org/", input_target_name);
+  char *user_define_msg = xy_strcat (5, msg, "| chsrc set ", input_target_name, " https://user-define-url.org/", input_target_name);
   if (target->can_user_define) printf (" %s%s\n", bdgreen(YesMark), purple(user_define_msg));
   else printf (" %s%s\n", bdred(NoMark), user_define_msg);br();
   }
 
   {
   char *msg = ENGLISH ? " Locally: Change source only for this project " : " Locally: 仅对本项目换源 ";
-  char *locally_msg = xy_strjoin (3, msg, "| chsrc set -local ", input_target_name);
+  char *locally_msg = xy_strcat (3, msg, "| chsrc set -local ", input_target_name);
 
   switch (target->cap_local)
     {
@@ -288,7 +288,7 @@ cli_print_target_features (Target_t *target, const char *input_target_name)
 
   {
   char *msg = ENGLISH ? " English: Output in English " : " English: 英文输出 ";
-  char *english_msg = xy_strjoin (3, msg, "| chsrc set -en ", input_target_name);
+  char *english_msg = xy_strcat (3, msg, "| chsrc set -en ", input_target_name);
   if (target->can_english) printf (" %s%s\n", bdgreen(YesMark), purple(english_msg));
   else printf (" %s%s\n", bdred(NoMark), english_msg);br();
   }
@@ -531,29 +531,29 @@ get_target (const char *input, TargetOp code, char *option)
         {
           target->setfn(option);
         }
-      else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现 set 功能，邀您帮助: chsrc issue"));
+      else chsrc_error (xy_strcat (3, "暂未对 ", input, " 实现 set 功能，邀您帮助: chsrc issue"));
     }
   else if (TargetOp_Reset_Source==code)
     {
       if (target->resetfn)
         {
           target->resetfn(option);
         }
-      else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现 reset 功能，邀您帮助: chsrc issue"));
+      else chsrc_error (xy_strcat (3, "暂未对 ", input, " 实现 reset 功能，邀您帮助: chsrc issue"));
     }
   else if (TargetOp_Get_Source==code)
     {
       if (target->getfn)
         {
           target->getfn("");
         }
-      else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现 get 功能，邀您帮助: chsrc issue"));
+      else chsrc_error (xy_strcat (3, "暂未对 ", input, " 实现 get 功能，邀您帮助: chsrc issue"));
     }
   else if (TargetOp_List_Config==code)
     {
       {
       char *msg = ENGLISH ? "To specify a source, use chsrc set " : "指定使用某源，请使用 chsrc set ";
-      say (bdblue(xy_strjoin (3, msg, input, " <code>\n")));
+      say (bdblue(xy_strcat (3, msg, input, " <code>\n")));
       }
 
       {
@@ -677,7 +677,7 @@ main (int argc, char const *argv[])
           else
             {
               char *msg = ENGLISH ? "Unknown option: " : "未识别的命令行选项 ";
-              chsrc_error (xy_2strjoin (msg, argv[i])); return Exit_Unknown;
+              chsrc_error (xy_2strcat (msg, argv[i])); return Exit_Unknown;
             }
           cli_arg_Target_pos++;
           cli_arg_Mirror_pos++;
@@ -860,7 +860,7 @@ main (int argc, char const *argv[])
     {
       char *msg1 = ENGLISH ? "Unknown command `" : "不支持的命令 ";
       char *msg2 = ENGLISH ? "`. Use `chsrc help` to view usage" : ". 请使用 chsrc help 查看使用方式";
-      chsrc_error (xy_strjoin (3, msg1, command, msg2));
+      chsrc_error (xy_strcat (3, msg1, command, msg2));
       return Exit_Unknown;
     }
 

src/framework/chef-helper.c

@@ -2,10 +2,10 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  * -------------------------------------------------------------
  * File Name     : chef-helper.c
- * File Authors  : Aoran Zeng <[email protected]>
- * Contributors  :  Nul None  <[email protected]>
+ * File Authors  : 曾奥然 <[email protected]>
+ * Contributors  : Nul None <[email protected]>
  * Created On    : <2025-07-14>
- * Last Modified : <2025-08-09>
+ * Last Modified : <2025-08-20>
  *
  * For chefs (recipe makers) and sometimes framewoker
  * to do some work not releated to OS operations
@@ -40,5 +40,5 @@ chef_ensure_trailing_slash (char *str)
   if (len == 0 || str[len - 1] == '/')
     return xy_strdup (str);
 
-  return xy_2strjoin (str, "/");
+  return xy_2strcat (str, "/");
 }

src/framework/chef.c

@@ -51,7 +51,7 @@ chef_set_provider_speed_measure_url (SourceProvider_t *provider, char *url)
 {
   provider->psmi.skip = NotSkip;
   provider->psmi.url = xy_strdup (url);
-  chsrc_debug ("m", xy_strjoin (4, "recipe 重新为 ", provider->code, " 设置测速链接: ", url));
+  chsrc_debug ("m", xy_strcat (4, "recipe 重新为 ", provider->code, " 设置测速链接: ", url));
 }
 
 
@@ -62,7 +62,7 @@ void
 chef_set_provider_speed_measure_accuracy (SourceProvider_t *provider, bool accuracy)
 {
   provider->psmi.accurate = accuracy;
-  chsrc_debug ("m", xy_strjoin (4, "recipe 重新为 ", provider->code, " 设置测速精度: ", accuracy ? "精准" : "粗略"));
+  chsrc_debug ("m", xy_strcat (4, "recipe 重新为 ", provider->code, " 设置测速精度: ", accuracy ? "精准" : "粗略"));
 }
 
 
@@ -99,7 +99,7 @@ chef_set_sources_speed_measure_url_with_func (
 void
 chef_set_sources_speed_measure_url_with_postfix (Target_t *target, char *postfix)
 {
-  chef_set_sources_speed_measure_url_with_func (target, xy_2strjoin, postfix);
+  chef_set_sources_speed_measure_url_with_func (target, xy_2strcat, postfix);
 }