Use nitems instead of "sizeof ypaliases/sizeof ypaliases[0]".
Make the if statement more expressive. Differential Revision: D3366 Reviewed by: ed Approved by: bapt, rodrigc (mentor)
This commit is contained in:
parent
9b71470214
commit
07c1d44f87
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=286716
@ -96,7 +96,7 @@ main(int argc, char *argv[])
|
|||||||
while ((c = getopt(argc, argv, "xd:kt")) != -1)
|
while ((c = getopt(argc, argv, "xd:kt")) != -1)
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'x':
|
case 'x':
|
||||||
for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
|
for (i = 0; i < nitems(ypaliases); i++)
|
||||||
printf("Use \"%s\" for \"%s\"\n",
|
printf("Use \"%s\" for \"%s\"\n",
|
||||||
ypaliases[i].alias, ypaliases[i].name);
|
ypaliases[i].alias, ypaliases[i].name);
|
||||||
exit(0);
|
exit(0);
|
||||||
@ -120,8 +120,8 @@ main(int argc, char *argv[])
|
|||||||
yp_get_default_domain(&domain);
|
yp_get_default_domain(&domain);
|
||||||
|
|
||||||
inmap = argv[optind];
|
inmap = argv[optind];
|
||||||
if (!notrans) {
|
if (notrans == 0) {
|
||||||
for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
|
for (i = 0; i < nitems(ypaliases); i++)
|
||||||
if (strcmp(inmap, ypaliases[i].alias) == 0)
|
if (strcmp(inmap, ypaliases[i].alias) == 0)
|
||||||
inmap = ypaliases[i].name;
|
inmap = ypaliases[i].name;
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ main(int argc, char *argv[])
|
|||||||
while ((c = getopt(argc, argv, "xd:mt")) != -1)
|
while ((c = getopt(argc, argv, "xd:mt")) != -1)
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'x':
|
case 'x':
|
||||||
for (i = 0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
|
for (i = 0; i < nitems(ypaliases); i++)
|
||||||
printf("\"%s\" is an alias for \"%s\"\n",
|
printf("\"%s\" is an alias for \"%s\"\n",
|
||||||
ypaliases[i].alias,
|
ypaliases[i].alias,
|
||||||
ypaliases[i].name);
|
ypaliases[i].name);
|
||||||
@ -169,7 +169,7 @@ main(int argc, char *argv[])
|
|||||||
usage();
|
usage();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!domnam)
|
if (domnam == NULL)
|
||||||
yp_get_default_domain(&domnam);
|
yp_get_default_domain(&domnam);
|
||||||
|
|
||||||
if (mode == 0) {
|
if (mode == 0) {
|
||||||
@ -206,9 +206,11 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
if (argv[optind]) {
|
if (argv[optind]) {
|
||||||
map = argv[optind];
|
map = argv[optind];
|
||||||
for (i = 0; (!notrans) && i<sizeof ypaliases/sizeof ypaliases[0]; i++)
|
if (notrans == 0) {
|
||||||
if (strcmp(map, ypaliases[i].alias) == 0)
|
for (i = 0; i < nitems(ypaliases); i++)
|
||||||
map = ypaliases[i].name;
|
if (strcmp(map, ypaliases[i].alias) == 0)
|
||||||
|
map = ypaliases[i].name;
|
||||||
|
}
|
||||||
r = yp_master(domnam, map, &master);
|
r = yp_master(domnam, map, &master);
|
||||||
switch (r) {
|
switch (r) {
|
||||||
case 0:
|
case 0:
|
||||||
|
Loading…
Reference in New Issue
Block a user