aboutsummaryrefslogtreecommitdiff
path: root/miscutils/i2c_tools.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-08-08 21:55:02 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-08-08 21:55:02 +0200
commit22542eca18e5807b72ddc78999f5101e33f17a53 (patch)
tree1271842a37c6215c998674a44bf7f561a0deff52 /miscutils/i2c_tools.c
parent036585a911a5fe6c2cd77b808dd9150500f37272 (diff)
downloadbusybox-w32-22542eca18e5807b72ddc78999f5101e33f17a53.tar.gz
busybox-w32-22542eca18e5807b72ddc78999f5101e33f17a53.tar.bz2
busybox-w32-22542eca18e5807b72ddc78999f5101e33f17a53.zip
getopt32: remove opt_complementary
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/i2c_tools.c')
-rw-r--r--miscutils/i2c_tools.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 8d04d2259..30f606e8e 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -455,14 +455,12 @@ int i2cget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
455int i2cget_main(int argc UNUSED_PARAM, char **argv) 455int i2cget_main(int argc UNUSED_PARAM, char **argv)
456{ 456{
457 const unsigned opt_f = (1 << 0), opt_y = (1 << 1); 457 const unsigned opt_f = (1 << 0), opt_y = (1 << 1);
458 const char *const optstr = "fy";
459 458
460 int bus_num, bus_addr, data_addr = -1, status; 459 int bus_num, bus_addr, data_addr = -1, status;
461 int mode = I2C_SMBUS_BYTE, pec = 0, fd; 460 int mode = I2C_SMBUS_BYTE, pec = 0, fd;
462 unsigned opts; 461 unsigned opts;
463 462
464 opt_complementary = "-2:?4"; /* from 2 to 4 args */ 463 opts = getopt32(argv, "^" "fy" "\0" "-2:?4"/*from 2 to 4 args*/);
465 opts = getopt32(argv, optstr);
466 argv += optind; 464 argv += optind;
467 465
468 bus_num = i2c_bus_lookup(argv[0]); 466 bus_num = i2c_bus_lookup(argv[0]);
@@ -544,7 +542,6 @@ int i2cset_main(int argc, char **argv)
544{ 542{
545 const unsigned opt_f = (1 << 0), opt_y = (1 << 1), 543 const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
546 opt_m = (1 << 2), opt_r = (1 << 3); 544 opt_m = (1 << 2), opt_r = (1 << 3);
547 const char *const optstr = "fym:r";
548 545
549 int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0; 546 int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0;
550 int val, blen = 0, mask = 0, fd, status; 547 int val, blen = 0, mask = 0, fd, status;
@@ -552,8 +549,7 @@ int i2cset_main(int argc, char **argv)
552 char *opt_m_arg = NULL; 549 char *opt_m_arg = NULL;
553 unsigned opts; 550 unsigned opts;
554 551
555 opt_complementary = "-3"; /* from 3 to ? args */ 552 opts = getopt32(argv, "^" "fym:r" "\0" "-3"/*from 3 to ? args*/, &opt_m_arg);
556 opts = getopt32(argv, optstr, &opt_m_arg);
557 argv += optind; 553 argv += optind;
558 argc -= optind; 554 argc -= optind;
559 555
@@ -905,7 +901,6 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
905{ 901{
906 const unsigned opt_f = (1 << 0), opt_y = (1 << 1), 902 const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
907 opt_r = (1 << 2); 903 opt_r = (1 << 2);
908 const char *const optstr = "fyr:";
909 904
910 int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0; 905 int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0;
911 unsigned first = 0x00, last = 0xff, opts; 906 unsigned first = 0x00, last = 0xff, opts;
@@ -913,8 +908,11 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
913 char *opt_r_str, *dash; 908 char *opt_r_str, *dash;
914 int fd, res; 909 int fd, res;
915 910
916 opt_complementary = "-2:?3"; /* from 2 to 3 args */ 911 opts = getopt32(argv, "^"
917 opts = getopt32(argv, optstr, &opt_r_str); 912 "fyr:"
913 "\0" "-2:?3" /* from 2 to 3 args */,
914 &opt_r_str
915 );
918 argv += optind; 916 argv += optind;
919 917
920 bus_num = i2c_bus_lookup(argv[0]); 918 bus_num = i2c_bus_lookup(argv[0]);
@@ -1208,15 +1206,16 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
1208 const unsigned opt_y = (1 << 0), opt_a = (1 << 1), 1206 const unsigned opt_y = (1 << 0), opt_a = (1 << 1),
1209 opt_q = (1 << 2), opt_r = (1 << 3), 1207 opt_q = (1 << 2), opt_r = (1 << 3),
1210 opt_F = (1 << 4), opt_l = (1 << 5); 1208 opt_F = (1 << 4), opt_l = (1 << 5);
1211 const char *const optstr = "yaqrFl";
1212 1209
1213 int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd; 1210 int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd;
1214 unsigned first = 0x03, last = 0x77, opts; 1211 unsigned first = 0x03, last = 0x77, opts;
1215 unsigned long funcs; 1212 unsigned long funcs;
1216 1213
1217 opt_complementary = "q--r:r--q:" /* mutually exclusive */ 1214 opts = getopt32(argv, "^"
1218 "?3"; /* up to 3 args */ 1215 "yaqrFl"
1219 opts = getopt32(argv, optstr); 1216 "\0"
1217 "q--r:r--q:"/*mutually exclusive*/ "?3"/*up to 3 args*/
1218 );
1220 argv += optind; 1219 argv += optind;
1221 1220
1222 if (opts & opt_l) 1221 if (opts & opt_l)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-25 06:35:16 +0000