diff options
author | Eric Andersen <andersen@codepoet.org> | 2002-07-11 11:11:56 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2002-07-11 11:11:56 +0000 |
commit | 2276d836398564a90f5ff237e63ca3104ae509f0 (patch) | |
tree | b516e1554a434ba539ed5318c0b3736940c1dd99 | |
parent | cafc10323099befd1e45bb1d212a511dcbb92b11 (diff) | |
download | busybox-w32-2276d836398564a90f5ff237e63ca3104ae509f0.tar.gz busybox-w32-2276d836398564a90f5ff237e63ca3104ae509f0.tar.bz2 busybox-w32-2276d836398564a90f5ff237e63ca3104ae509f0.zip |
Fixup warnings and undefined operations that show up in gcc-3.1
-Erik
-rw-r--r-- | archival/libunarchive/deb_extract.c | 3 | ||||
-rw-r--r-- | archival/libunarchive/get_header_ar.c | 3 | ||||
-rw-r--r-- | archival/libunarchive/get_header_cpio.c | 3 | ||||
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 3 | ||||
-rw-r--r-- | archival/libunarchive/seek_sub_file.c | 3 | ||||
-rw-r--r-- | coreutils/md5sum.c | 10 | ||||
-rw-r--r-- | coreutils/uuencode.c | 3 | ||||
-rw-r--r-- | editors/sed.c | 6 | ||||
-rw-r--r-- | networking/ifconfig.c | 3 | ||||
-rw-r--r-- | networking/telnet.c | 1 | ||||
-rw-r--r-- | shell/ash.c | 4 |
11 files changed, 26 insertions, 16 deletions
diff --git a/archival/libunarchive/deb_extract.c b/archival/libunarchive/deb_extract.c index e5b5c9685..b95ac4d1f 100644 --- a/archival/libunarchive/deb_extract.c +++ b/archival/libunarchive/deb_extract.c | |||
@@ -80,4 +80,5 @@ char *deb_extract(const char *package_filename, FILE *out_stream, | |||
80 | free(file_list); | 80 | free(file_list); |
81 | } | 81 | } |
82 | return(output_buffer); | 82 | return(output_buffer); |
83 | } \ No newline at end of file | 83 | } |
84 | |||
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c index d2840e0e3..1618b767f 100644 --- a/archival/libunarchive/get_header_ar.c +++ b/archival/libunarchive/get_header_ar.c | |||
@@ -103,4 +103,5 @@ file_header_t *get_header_ar(FILE *src_stream) | |||
103 | typed->gid = atoi(ar.formated.gid); | 103 | typed->gid = atoi(ar.formated.gid); |
104 | 104 | ||
105 | return(typed); | 105 | return(typed); |
106 | } \ No newline at end of file | 106 | } |
107 | |||
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index a2136e441..cd48601b6 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c | |||
@@ -133,4 +133,5 @@ file_header_t *get_header_cpio(FILE *src_stream) | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | return(cpio_entry); | 135 | return(cpio_entry); |
136 | } \ No newline at end of file | 136 | } |
137 | |||
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 639e2dc36..be6bf2a06 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
@@ -96,4 +96,5 @@ file_header_t *get_header_tar(FILE *tar_stream) | |||
96 | strtol(tar.formated.devminor, NULL, 8); | 96 | strtol(tar.formated.devminor, NULL, 8); |
97 | 97 | ||
98 | return(tar_entry); | 98 | return(tar_entry); |
99 | } \ No newline at end of file | 99 | } |
100 | |||
diff --git a/archival/libunarchive/seek_sub_file.c b/archival/libunarchive/seek_sub_file.c index 72a3754bc..7523a52ab 100644 --- a/archival/libunarchive/seek_sub_file.c +++ b/archival/libunarchive/seek_sub_file.c | |||
@@ -32,4 +32,5 @@ void seek_sub_file(FILE *src_stream, const int count) | |||
32 | } | 32 | } |
33 | } | 33 | } |
34 | return; | 34 | return; |
35 | } \ No newline at end of file | 35 | } |
36 | |||
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c index 83c769ef2..f5be4486c 100644 --- a/coreutils/md5sum.c +++ b/coreutils/md5sum.c | |||
@@ -434,7 +434,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct | |||
434 | temp += FI(B,C,D); | 434 | temp += FI(B,C,D); |
435 | } | 435 | } |
436 | temp += cwp[(int)(*pp++)] + *pc++; | 436 | temp += cwp[(int)(*pp++)] + *pc++; |
437 | temp = CYCLIC (temp, ps[i&3]); | 437 | CYCLIC (temp, ps[i&3]); |
438 | temp += B; | 438 | temp += B; |
439 | A = D; D = C; C = B; B = temp; | 439 | A = D; D = C; C = B; B = temp; |
440 | } | 440 | } |
@@ -443,7 +443,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct | |||
443 | 443 | ||
444 | for ( i = 0 ; i < 16 ; i++ ) { | 444 | for ( i = 0 ; i < 16 ; i++ ) { |
445 | temp = A + FF(B,C,D) + cwp[(int)(*pp++)] + *pc++; | 445 | temp = A + FF(B,C,D) + cwp[(int)(*pp++)] + *pc++; |
446 | temp = CYCLIC (temp, ps[i&3]); | 446 | CYCLIC (temp, ps[i&3]); |
447 | temp += B; | 447 | temp += B; |
448 | A = D; D = C; C = B; B = temp; | 448 | A = D; D = C; C = B; B = temp; |
449 | } | 449 | } |
@@ -451,21 +451,21 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct | |||
451 | ps += 4; | 451 | ps += 4; |
452 | for ( i = 0 ; i < 16 ; i++ ) { | 452 | for ( i = 0 ; i < 16 ; i++ ) { |
453 | temp = A + FG(B,C,D) + cwp[(int)(*pp++)] + *pc++; | 453 | temp = A + FG(B,C,D) + cwp[(int)(*pp++)] + *pc++; |
454 | temp = CYCLIC (temp, ps[i&3]); | 454 | CYCLIC (temp, ps[i&3]); |
455 | temp += B; | 455 | temp += B; |
456 | A = D; D = C; C = B; B = temp; | 456 | A = D; D = C; C = B; B = temp; |
457 | } | 457 | } |
458 | ps += 4; | 458 | ps += 4; |
459 | for ( i = 0 ; i < 16 ; i++ ) { | 459 | for ( i = 0 ; i < 16 ; i++ ) { |
460 | temp = A + FH(B,C,D) + cwp[(int)(*pp++)] + *pc++; | 460 | temp = A + FH(B,C,D) + cwp[(int)(*pp++)] + *pc++; |
461 | temp = CYCLIC (temp, ps[i&3]); | 461 | CYCLIC (temp, ps[i&3]); |
462 | temp += B; | 462 | temp += B; |
463 | A = D; D = C; C = B; B = temp; | 463 | A = D; D = C; C = B; B = temp; |
464 | } | 464 | } |
465 | ps += 4; | 465 | ps += 4; |
466 | for ( i = 0 ; i < 16 ; i++ ) { | 466 | for ( i = 0 ; i < 16 ; i++ ) { |
467 | temp = A + FI(B,C,D) + cwp[(int)(*pp++)] + *pc++; | 467 | temp = A + FI(B,C,D) + cwp[(int)(*pp++)] + *pc++; |
468 | temp = CYCLIC (temp, ps[i&3]); | 468 | CYCLIC (temp, ps[i&3]); |
469 | temp += B; | 469 | temp += B; |
470 | A = D; D = C; C = B; B = temp; | 470 | A = D; D = C; C = B; B = temp; |
471 | } | 471 | } |
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c index 24b9f1c6a..1d42494fd 100644 --- a/coreutils/uuencode.c +++ b/coreutils/uuencode.c | |||
@@ -21,6 +21,7 @@ | |||
21 | */ | 21 | */ |
22 | #include <getopt.h> | 22 | #include <getopt.h> |
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <string.h> | ||
24 | #include <stdlib.h> | 25 | #include <stdlib.h> |
25 | #include <sys/types.h> | 26 | #include <sys/types.h> |
26 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
@@ -49,7 +50,7 @@ static char tbl_std[65] = { | |||
49 | 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', | 50 | 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', |
50 | 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', | 51 | 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', |
51 | 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', | 52 | 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', |
52 | '\`' /* termination character */ | 53 | '`' /* termination character */ |
53 | }; | 54 | }; |
54 | 55 | ||
55 | /* | 56 | /* |
diff --git a/editors/sed.c b/editors/sed.c index 93faf00c2..84aea9b0a 100644 --- a/editors/sed.c +++ b/editors/sed.c | |||
@@ -401,8 +401,10 @@ static char *parse_cmd_str(struct sed_cmd * const sed_cmd, const char *const cmd | |||
401 | idx = get_address(sed_cmd, cmdstr, &sed_cmd->beg_line, &sed_cmd->beg_match); | 401 | idx = get_address(sed_cmd, cmdstr, &sed_cmd->beg_line, &sed_cmd->beg_match); |
402 | 402 | ||
403 | /* second part (if present) will begin with a comma */ | 403 | /* second part (if present) will begin with a comma */ |
404 | if (cmdstr[idx] == ',') | 404 | if (cmdstr[idx] == ',') { |
405 | idx += get_address(sed_cmd, &cmdstr[++idx], &sed_cmd->end_line, &sed_cmd->end_match); | 405 | idx++; |
406 | idx += get_address(sed_cmd, &cmdstr[idx], &sed_cmd->end_line, &sed_cmd->end_match); | ||
407 | } | ||
406 | 408 | ||
407 | /* skip whitespace before the command */ | 409 | /* skip whitespace before the command */ |
408 | while (isspace(cmdstr[idx])) | 410 | while (isspace(cmdstr[idx])) |
diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 9e87c8be5..3ada4f178 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * Foundation; either version 2 of the License, or (at | 15 | * Foundation; either version 2 of the License, or (at |
16 | * your option) any later version. | 16 | * your option) any later version. |
17 | * | 17 | * |
18 | * $Id: ifconfig.c,v 1.17 2002/07/03 11:46:34 andersen Exp $ | 18 | * $Id: ifconfig.c,v 1.18 2002/07/11 11:11:52 andersen Exp $ |
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
@@ -504,6 +504,7 @@ int ifconfig_main(int argc, char **argv) | |||
504 | } | 504 | } |
505 | } | 505 | } |
506 | LOOP: | 506 | LOOP: |
507 | continue; | ||
507 | } /* end of while-loop */ | 508 | } /* end of while-loop */ |
508 | 509 | ||
509 | return goterr; | 510 | return goterr; |
diff --git a/networking/telnet.c b/networking/telnet.c index 86d672c2d..14b71c85d 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <errno.h> | 36 | #include <errno.h> |
37 | #include <stdlib.h> | 37 | #include <stdlib.h> |
38 | #include <stdarg.h> | 38 | #include <stdarg.h> |
39 | #include <string.h> | ||
39 | #include <signal.h> | 40 | #include <signal.h> |
40 | #include <arpa/telnet.h> | 41 | #include <arpa/telnet.h> |
41 | #include <sys/types.h> | 42 | #include <sys/types.h> |
diff --git a/shell/ash.c b/shell/ash.c index 3d7043c8f..64761b9aa 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -11129,7 +11129,7 @@ redirect(union node *redir, int flags) | |||
11129 | { | 11129 | { |
11130 | union node *n; | 11130 | union node *n; |
11131 | struct redirtab *sv = NULL; | 11131 | struct redirtab *sv = NULL; |
11132 | int i; | 11132 | int i = EMPTY; |
11133 | int fd; | 11133 | int fd; |
11134 | int newfd; | 11134 | int newfd; |
11135 | int try; | 11135 | int try; |
@@ -12440,7 +12440,7 @@ findvar(struct var **vpp, const char *name) | |||
12440 | /* | 12440 | /* |
12441 | * Copyright (c) 1999 Herbert Xu <herbert@debian.org> | 12441 | * Copyright (c) 1999 Herbert Xu <herbert@debian.org> |
12442 | * This file contains code for the times builtin. | 12442 | * This file contains code for the times builtin. |
12443 | * $Id: ash.c,v 1.54 2002/07/04 00:19:46 andersen Exp $ | 12443 | * $Id: ash.c,v 1.55 2002/07/11 11:11:51 andersen Exp $ |
12444 | */ | 12444 | */ |
12445 | static int timescmd (int argc, char **argv) | 12445 | static int timescmd (int argc, char **argv) |
12446 | { | 12446 | { |