Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256140
b: refs/heads/master
c: d804c6f
h: refs/heads/master
v: v3
  • Loading branch information
Shan Wei authored and David S. Miller committed Jul 7, 2011
1 parent 7684519 commit 0d7d3a5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fa917ff739eace9e1e1c214bd067a7a0f7bc264b
refs/heads/master: d804c6f2122ae4ffac21757c7774007e38093390
18 changes: 9 additions & 9 deletions trunk/Documentation/networking/ifenslave.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,36 +260,36 @@ int main(int argc, char *argv[])
case 'V': opt_V++; exclusive++; break;

case '?':
fprintf(stderr, usage_msg);
fprintf(stderr, "%s", usage_msg);
res = 2;
goto out;
}
}

/* options check */
if (exclusive > 1) {
fprintf(stderr, usage_msg);
fprintf(stderr, "%s", usage_msg);
res = 2;
goto out;
}

if (opt_v || opt_V) {
printf(version);
printf("%s", version);
if (opt_V) {
res = 0;
goto out;
}
}

if (opt_u) {
printf(usage_msg);
printf("%s", usage_msg);
res = 0;
goto out;
}

if (opt_h) {
printf(usage_msg);
printf(help_msg);
printf("%s", usage_msg);
printf("%s", help_msg);
res = 0;
goto out;
}
Expand All @@ -309,7 +309,7 @@ int main(int argc, char *argv[])
goto out;
} else {
/* Just show usage */
fprintf(stderr, usage_msg);
fprintf(stderr, "%s", usage_msg);
res = 2;
goto out;
}
Expand All @@ -320,7 +320,7 @@ int main(int argc, char *argv[])
master_ifname = *spp++;

if (master_ifname == NULL) {
fprintf(stderr, usage_msg);
fprintf(stderr, "%s", usage_msg);
res = 2;
goto out;
}
Expand All @@ -339,7 +339,7 @@ int main(int argc, char *argv[])

if (slave_ifname == NULL) {
if (opt_d || opt_c) {
fprintf(stderr, usage_msg);
fprintf(stderr, "%s", usage_msg);
res = 2;
goto out;
}
Expand Down

0 comments on commit 0d7d3a5

Please sign in to comment.