Rename to xy_arylen()

This commit is contained in:
Aoran Zeng 2023-08-31 21:48:05 +08:00
parent b3c0d3be06
commit f1df0ffb06
2 changed files with 23 additions and 23 deletions

22
chsrc.c
View File

@ -567,11 +567,11 @@ static const char const
}, },
*wr_tex[] = {"latex", "ctan", "tex", NULL, NULL},
*wr_anaconda[] = {"conda", "anaconda", NULL, NULL}, *wr_anaconda[] = {"conda", "anaconda", NULL, NULL},
*wr_tex [] = {"latex", "ctan", "tex", NULL, NULL},
*wr_emacs [] = {"emacs", NULL, NULL}, *wr_emacs [] = {"emacs", NULL, NULL},
**wr_softwares[] = {wr_tex, wr_anaconda, wr_emacs}; **wr_softwares[] = {wr_anaconda, wr_tex, wr_emacs};
#undef chsrcfunc #undef chsrcfunc
@ -609,8 +609,8 @@ call_cmd (void* cmdptr, const char* arg)
void void
print_available_mirrors () print_available_mirrors ()
{ {
// xy_info ("chsrc: 可用以下镜像站,所有的致谢属于这些站点以及它们的开发/维护者们"); xy_info ("chsrc: 可用以下镜像站,所有的致谢属于这些站点以及它们的开发/维护者们");
for (int i=0; i<Array_Size(available_mirrors); i++) for (int i=0; i<xy_arylen(available_mirrors); i++)
{ {
mirror_info* mir = available_mirrors[i]; mirror_info* mir = available_mirrors[i];
printf ("%-14s ", mir->abbr); printf ("%-14s ", mir->abbr);
@ -642,18 +642,18 @@ print_supported_targets ()
{ {
xy_info ("chsrc: 支持对以下目标换源 (同一行表示这几个命令兼容)"); xy_info ("chsrc: 支持对以下目标换源 (同一行表示这几个命令兼容)");
xy_warn ("编程语言开发"); xy_warn ("编程语言开发");
print_supported_targets_ (pl_packagers, Array_Size(pl_packagers)); print_supported_targets_ (pl_packagers, xy_arylen(pl_packagers));
xy_warn ("操作系统"); xy_warn ("操作系统");
print_supported_targets_ (os_systems, Array_Size(os_systems)); print_supported_targets_ (os_systems, xy_arylen(os_systems));
xy_warn ("软件"); xy_warn ("软件");
print_supported_targets_ (wr_softwares, Array_Size(wr_softwares)); print_supported_targets_ (wr_softwares, xy_arylen(wr_softwares));
} }
int int
print_help () print_help ()
{ {
for (int i=0; i<Array_Size(usage); i++) { for (int i=0; i<xy_arylen(usage); i++) {
puts (usage[i]); puts (usage[i]);
} }
} }
@ -751,7 +751,7 @@ main (int argc, char const *argv[])
int matched = 0; int matched = 0;
for (int i=0; i<Array_Size(pl_packagers); i++) { for (int i=0; i<xy_arylen(pl_packagers); i++) {
const char const** packager = pl_packagers[i]; const char const** packager = pl_packagers[i];
int k = 0; int k = 0;
const char* alias = packager[k]; const char* alias = packager[k];
@ -772,7 +772,7 @@ main (int argc, char const *argv[])
} }
goto match_end; goto match_end;
for (int i=0; i<Array_Size(os_systems); i++) { for (int i=0; i<xy_arylen(os_systems); i++) {
const char const** system = os_systems[i]; const char const** system = os_systems[i];
int k = 0; int k = 0;
const char* alias = system[k]; const char* alias = system[k];
@ -794,7 +794,7 @@ main (int argc, char const *argv[])
} }
goto match_end; goto match_end;
for (int i=0; i<Array_Size(wr_softwares); i++) { for (int i=0; i<xy_arylen(wr_softwares); i++) {
const char const** ware = wr_softwares[i]; const char const** ware = wr_softwares[i];
int k = 0; int k = 0;
const char* alias = ware[k]; const char* alias = ware[k];

View File

@ -39,7 +39,7 @@
#endif #endif
#define Array_Size(x) (sizeof(x) / sizeof(x[0])) #define xy_arylen(x) (sizeof(x) / sizeof(x[0]))
static inline void* static inline void*