projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo fixes
[oweals/busybox.git]
/
networking
/
slattach.c
diff --git
a/networking/slattach.c
b/networking/slattach.c
index a500da6d061735df93f2a1bf337563c687d0034b..2d1305e32abf6a9c08699baf5dd33fadb48ad305 100644
(file)
--- a/
networking/slattach.c
+++ b/
networking/slattach.c
@@
-27,18
+27,19
@@
//usage: "\n -F Disable RTS/CTS flow control"
#include "libbb.h"
//usage: "\n -F Disable RTS/CTS flow control"
#include "libbb.h"
-#include "libiproute/utils.h" /* invarg() */
+#include "common_bufsiz.h"
+#include "libiproute/utils.h" /* invarg_1_to_2() */
struct globals {
int handle;
int saved_disc;
struct termios saved_state;
} FIX_ALIASING;
struct globals {
int handle;
int saved_disc;
struct termios saved_state;
} FIX_ALIASING;
-#define G (*(struct globals*)
&
bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
#define handle (G.handle )
#define saved_disc (G.saved_disc )
#define saved_state (G.saved_state )
#define handle (G.handle )
#define saved_disc (G.saved_disc )
#define saved_state (G.saved_state )
-#define INIT_G() do { } while (0)
+#define INIT_G() do {
setup_common_bufsiz();
} while (0)
/*
/*
@@
-175,7
+176,7
@@
int slattach_main(int argc UNUSED_PARAM, char **argv)
encap = index_in_strings(proto_names, proto);
if (encap < 0)
encap = index_in_strings(proto_names, proto);
if (encap < 0)
- invarg(proto, "protocol");
+ invarg
_1_to_2
(proto, "protocol");
if (encap > 3)
encap = 8;
if (encap > 3)
encap = 8;
@@
-183,7
+184,7
@@
int slattach_main(int argc UNUSED_PARAM, char **argv)
if (opt & OPT_s_baud) {
baud_code = tty_value_to_baud(xatoi(baud_str));
if (baud_code < 0)
if (opt & OPT_s_baud) {
baud_code = tty_value_to_baud(xatoi(baud_str));
if (baud_code < 0)
- invarg(baud_str, "baud rate");
+ invarg
_1_to_2
(baud_str, "baud rate");
}
/* Trap signals in order to restore tty states upon exit */
}
/* Trap signals in order to restore tty states upon exit */