diff options
author | Rob Landley <rob@landley.net> | 2006-08-29 19:41:06 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-08-29 19:41:06 +0000 |
commit | 88621d73980a3cb53c1f35e64a06d7cd64188987 (patch) | |
tree | c0398d52bf44783d2dc330b4b33a908a58d2d55b /networking | |
parent | 8c1eda528a19b8af18568649e8d2b1ba5bda772e (diff) | |
download | busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.gz busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.bz2 busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.zip |
Svn 16007 broke the build under gcc 4.0.3. This fixes up some of the damage
(the e2fsprogs directory is too twisty and evil to easily fix, but I plan
to rewrite it anyway so I'll just bump that up in priority a bit).
Diffstat (limited to 'networking')
-rw-r--r-- | networking/fakeidentd.c | 4 | ||||
-rw-r--r-- | networking/telnet.c | 16 | ||||
-rw-r--r-- | networking/zcip.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c index 6ee7c328e..b965147e1 100644 --- a/networking/fakeidentd.c +++ b/networking/fakeidentd.c | |||
@@ -64,7 +64,7 @@ static void replyError(int s, char *buf); | |||
64 | static const char *nobodystr = "nobody"; /* this needs to be declared like this */ | 64 | static const char *nobodystr = "nobody"; /* this needs to be declared like this */ |
65 | static char *bind_ip_address = "0.0.0.0"; | 65 | static char *bind_ip_address = "0.0.0.0"; |
66 | 66 | ||
67 | static inline void movefd(int from, int to) | 67 | static void movefd(int from, int to) |
68 | { | 68 | { |
69 | if (from != to) { | 69 | if (from != to) { |
70 | dup2(from, to); | 70 | dup2(from, to); |
@@ -108,7 +108,7 @@ static void handlexitsigs(int signum) | |||
108 | } | 108 | } |
109 | 109 | ||
110 | /* May succeed. If not, won't care. */ | 110 | /* May succeed. If not, won't care. */ |
111 | static inline void writepid(uid_t nobody, uid_t nogrp) | 111 | static void writepid(uid_t nobody, uid_t nogrp) |
112 | { | 112 | { |
113 | char buf[24]; | 113 | char buf[24]; |
114 | int fd = open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0664); | 114 | int fd = open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0664); |
diff --git a/networking/telnet.c b/networking/telnet.c index 59268c6de..5324d7a20 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -88,7 +88,7 @@ struct Globalvars * Gptr; | |||
88 | #define G (*Gptr) | 88 | #define G (*Gptr) |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | static inline void iacflush(void) | 91 | static void iacflush(void) |
92 | { | 92 | { |
93 | write(G.netfd, G.iacbuf, G.iaclen); | 93 | write(G.netfd, G.iacbuf, G.iaclen); |
94 | G.iaclen = 0; | 94 | G.iaclen = 0; |
@@ -291,7 +291,7 @@ static void handlenetinput(int len) | |||
291 | 291 | ||
292 | /* ******************************* */ | 292 | /* ******************************* */ |
293 | 293 | ||
294 | static inline void putiac(int c) | 294 | static void putiac(int c) |
295 | { | 295 | { |
296 | G.iacbuf[G.iaclen++] = c; | 296 | G.iacbuf[G.iaclen++] = c; |
297 | } | 297 | } |
@@ -428,13 +428,13 @@ static void do_linemode(void) | |||
428 | 428 | ||
429 | /* ******************************* */ | 429 | /* ******************************* */ |
430 | 430 | ||
431 | static inline void to_notsup(char c) | 431 | static void to_notsup(char c) |
432 | { | 432 | { |
433 | if (G.telwish == WILL) putiac2(DONT, c); | 433 | if (G.telwish == WILL) putiac2(DONT, c); |
434 | else if (G.telwish == DO) putiac2(WONT, c); | 434 | else if (G.telwish == DO) putiac2(WONT, c); |
435 | } | 435 | } |
436 | 436 | ||
437 | static inline void to_echo(void) | 437 | static void to_echo(void) |
438 | { | 438 | { |
439 | /* if server requests ECHO, don't agree */ | 439 | /* if server requests ECHO, don't agree */ |
440 | if (G.telwish == DO) { putiac2(WONT, TELOPT_ECHO); return; } | 440 | if (G.telwish == DO) { putiac2(WONT, TELOPT_ECHO); return; } |
@@ -461,7 +461,7 @@ static inline void to_echo(void) | |||
461 | WriteCS(1, "\r\n"); /* sudden modec */ | 461 | WriteCS(1, "\r\n"); /* sudden modec */ |
462 | } | 462 | } |
463 | 463 | ||
464 | static inline void to_sga(void) | 464 | static void to_sga(void) |
465 | { | 465 | { |
466 | /* daemon always sends will/wont, client do/dont */ | 466 | /* daemon always sends will/wont, client do/dont */ |
467 | 467 | ||
@@ -483,7 +483,7 @@ static inline void to_sga(void) | |||
483 | } | 483 | } |
484 | 484 | ||
485 | #ifdef CONFIG_FEATURE_TELNET_TTYPE | 485 | #ifdef CONFIG_FEATURE_TELNET_TTYPE |
486 | static inline void to_ttype(void) | 486 | static void to_ttype(void) |
487 | { | 487 | { |
488 | /* Tell server we will (or won't) do TTYPE */ | 488 | /* Tell server we will (or won't) do TTYPE */ |
489 | 489 | ||
@@ -497,7 +497,7 @@ static inline void to_ttype(void) | |||
497 | #endif | 497 | #endif |
498 | 498 | ||
499 | #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN | 499 | #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN |
500 | static inline void to_new_environ(void) | 500 | static void to_new_environ(void) |
501 | { | 501 | { |
502 | /* Tell server we will (or will not) do AUTOLOGIN */ | 502 | /* Tell server we will (or will not) do AUTOLOGIN */ |
503 | 503 | ||
@@ -511,7 +511,7 @@ static inline void to_new_environ(void) | |||
511 | #endif | 511 | #endif |
512 | 512 | ||
513 | #ifdef CONFIG_FEATURE_AUTOWIDTH | 513 | #ifdef CONFIG_FEATURE_AUTOWIDTH |
514 | static inline void to_naws(void) | 514 | static void to_naws(void) |
515 | { | 515 | { |
516 | /* Tell server we will do NAWS */ | 516 | /* Tell server we will do NAWS */ |
517 | putiac2(WILL, TELOPT_NAWS); | 517 | putiac2(WILL, TELOPT_NAWS); |
diff --git a/networking/zcip.c b/networking/zcip.c index 5e1067377..d49bb7669 100644 --- a/networking/zcip.c +++ b/networking/zcip.c | |||
@@ -173,7 +173,7 @@ bad: | |||
173 | /** | 173 | /** |
174 | * Return milliseconds of random delay, up to "secs" seconds. | 174 | * Return milliseconds of random delay, up to "secs" seconds. |
175 | */ | 175 | */ |
176 | static inline unsigned ms_rdelay(unsigned secs) | 176 | static unsigned ATTRIBUTE_ALWAYS_INLINE ms_rdelay(unsigned secs) |
177 | { | 177 | { |
178 | return lrand48() % (secs * 1000); | 178 | return lrand48() % (secs * 1000); |
179 | } | 179 | } |