diff options
| author |   krw <krw@openbsd.org> | 2012-07-08 11:32:58 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2012-07-08 11:32:58 +0000 |
| commit | f2985c8a1e33c69947b50ba9589d2d5ec65a1b3d (patch) | |
| tree | 65122d898b17fc92cfecf5b7da51ea08c7c5975a | |
| parent | a -> an in a comment (diff) | |
| download | wireguard-openbsd-f2985c8a1e33c69947b50ba9589d2d5ec65a1b3d.tar.xz wireguard-openbsd-f2985c8a1e33c69947b50ba9589d2d5ec65a1b3d.zip | |
Nuke useless EDIT() #define in Xsetpid.
A #define to simplify a function calling snippet does not simply or
help when it is used only once.
| -rw-r--r-- | sbin/fdisk/cmd.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c index 56f1e0793ce..0ed30dd2d0f 100644 --- a/sbin/fdisk/cmd.c +++ b/sbin/fdisk/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.49 2012/07/08 10:11:59 krw Exp $ */ +/* $OpenBSD: cmd.c,v 1.50 2012/07/08 11:32:58 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -241,21 +241,20 @@ Xsetpid(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset) printf("partition number is %s: %s\n", errstr, cmd->args); return (ret); } + pp = &mbr->part[pn]; /* Print out current table entry */ - pp = &mbr->part[pn]; PRT_print(0, NULL, NULL); PRT_print(pn, pp, NULL); -#define EDIT(p, f, v, n, m, h) \ - if ((num = ask_num(p, f, v, n, m, h)) != v) \ - ret = CMD_DIRTY; \ - v = num; - /* Ask for partition type */ - EDIT("Partition id ('0' to disable) ", ASK_HEX, pp->id, 0, 0xFF, PRT_printall); + num = ask_num("Partition id ('0' to disable) ", ASK_HEX, pp->id, 0, + 0xFF, PRT_printall); + if (num != pp->id) + ret = CMD_DIRTY; + + pp->id = num; -#undef EDIT return (ret); } |