diff options
| author | Mark Whitley <markw@lineo.com> | 2000-12-07 19:56:48 +0000 |
|---|---|---|
| committer | Mark Whitley <markw@lineo.com> | 2000-12-07 19:56:48 +0000 |
| commit | f57c944e09417edcbcd69f2b01b937cadef39db2 (patch) | |
| tree | a55822621d54bd82c54e272fa986e45698fea0f1 /gunzip.c | |
| parent | 7b5c16ebe5f1b057603cf1c0b0187be418725c42 (diff) | |
| download | busybox-w32-f57c944e09417edcbcd69f2b01b937cadef39db2.tar.gz busybox-w32-f57c944e09417edcbcd69f2b01b937cadef39db2.tar.bz2 busybox-w32-f57c944e09417edcbcd69f2b01b937cadef39db2.zip | |
Changed names of functions in utility.c and all affected files, to make
compliant with the style guide. Everybody rebuild your tags file!
Diffstat (limited to 'gunzip.c')
| -rw-r--r-- | gunzip.c | 22 |
1 files changed, 11 insertions, 11 deletions
| @@ -113,7 +113,7 @@ static char *license_msg[] = { | |||
| 113 | 113 | ||
| 114 | /* Diagnostic functions */ | 114 | /* Diagnostic functions */ |
| 115 | #ifdef DEBUG | 115 | #ifdef DEBUG |
| 116 | # define Assert(cond,msg) {if(!(cond)) errorMsg(msg);} | 116 | # define Assert(cond,msg) {if(!(cond)) error_msg(msg);} |
| 117 | # define Trace(x) fprintf x | 117 | # define Trace(x) fprintf x |
| 118 | # define Tracev(x) {if (verbose) fprintf x ;} | 118 | # define Tracev(x) {if (verbose) fprintf x ;} |
| 119 | # define Tracevv(x) {if (verbose>1) fprintf x ;} | 119 | # define Tracevv(x) {if (verbose>1) fprintf x ;} |
| @@ -297,7 +297,7 @@ int in; /* input file descriptor */ | |||
| 297 | 297 | ||
| 298 | method = (int) get_byte(); | 298 | method = (int) get_byte(); |
| 299 | if (method != DEFLATED) { | 299 | if (method != DEFLATED) { |
| 300 | errorMsg("unknown method %d -- get newer version of gzip\n", method); | 300 | error_msg("unknown method %d -- get newer version of gzip\n", method); |
| 301 | exit_code = ERROR; | 301 | exit_code = ERROR; |
| 302 | return -1; | 302 | return -1; |
| 303 | } | 303 | } |
| @@ -1114,13 +1114,13 @@ int in, out; /* input and output file descriptors */ | |||
| 1114 | int res = inflate(); | 1114 | int res = inflate(); |
| 1115 | 1115 | ||
| 1116 | if (res == 3) { | 1116 | if (res == 3) { |
| 1117 | errorMsg(memory_exhausted); | 1117 | error_msg(memory_exhausted); |
| 1118 | } else if (res != 0) { | 1118 | } else if (res != 0) { |
| 1119 | errorMsg("invalid compressed data--format violated\n"); | 1119 | error_msg("invalid compressed data--format violated\n"); |
| 1120 | } | 1120 | } |
| 1121 | 1121 | ||
| 1122 | } else { | 1122 | } else { |
| 1123 | errorMsg("internal error, invalid method\n"); | 1123 | error_msg("internal error, invalid method\n"); |
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | /* Get the crc and original length */ | 1126 | /* Get the crc and original length */ |
| @@ -1149,10 +1149,10 @@ int in, out; /* input and output file descriptors */ | |||
| 1149 | 1149 | ||
| 1150 | /* Validate decompression */ | 1150 | /* Validate decompression */ |
| 1151 | if (orig_crc != updcrc(outbuf, 0)) { | 1151 | if (orig_crc != updcrc(outbuf, 0)) { |
| 1152 | errorMsg("invalid compressed data--crc error\n"); | 1152 | error_msg("invalid compressed data--crc error\n"); |
| 1153 | } | 1153 | } |
| 1154 | if (orig_len != (ulg) bytes_out) { | 1154 | if (orig_len != (ulg) bytes_out) { |
| 1155 | errorMsg("invalid compressed data--length error\n"); | 1155 | error_msg("invalid compressed data--length error\n"); |
| 1156 | } | 1156 | } |
| 1157 | 1157 | ||
| 1158 | /* Check if there are more entries in a pkzip file */ | 1158 | /* Check if there are more entries in a pkzip file */ |
| @@ -1225,9 +1225,9 @@ int gunzip_main(int argc, char **argv) | |||
| 1225 | } | 1225 | } |
| 1226 | 1226 | ||
| 1227 | if (isatty(fileno(stdin)) && fromstdin==1 && force==0) | 1227 | if (isatty(fileno(stdin)) && fromstdin==1 && force==0) |
| 1228 | fatalError( "data not read from terminal. Use -f to force it.\n"); | 1228 | error_msg_and_die( "data not read from terminal. Use -f to force it.\n"); |
| 1229 | if (isatty(fileno(stdout)) && tostdout==1 && force==0) | 1229 | if (isatty(fileno(stdout)) && tostdout==1 && force==0) |
| 1230 | fatalError( "data not written to terminal. Use -f to force it.\n"); | 1230 | error_msg_and_die( "data not written to terminal. Use -f to force it.\n"); |
| 1231 | 1231 | ||
| 1232 | 1232 | ||
| 1233 | foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; | 1233 | foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; |
| @@ -1265,7 +1265,7 @@ int gunzip_main(int argc, char **argv) | |||
| 1265 | if (argc <= 0) | 1265 | if (argc <= 0) |
| 1266 | usage(gunzip_usage); | 1266 | usage(gunzip_usage); |
| 1267 | if (strlen(*argv) > MAX_PATH_LEN) { | 1267 | if (strlen(*argv) > MAX_PATH_LEN) { |
| 1268 | errorMsg(name_too_long); | 1268 | error_msg(name_too_long); |
| 1269 | exit(WARNING); | 1269 | exit(WARNING); |
| 1270 | } | 1270 | } |
| 1271 | strcpy(ifname, *argv); | 1271 | strcpy(ifname, *argv); |
| @@ -1304,7 +1304,7 @@ int gunzip_main(int argc, char **argv) | |||
| 1304 | 1304 | ||
| 1305 | /* And get to work */ | 1305 | /* And get to work */ |
| 1306 | if (strlen(ifname) > MAX_PATH_LEN - 4) { | 1306 | if (strlen(ifname) > MAX_PATH_LEN - 4) { |
| 1307 | errorMsg(name_too_long); | 1307 | error_msg(name_too_long); |
| 1308 | exit(WARNING); | 1308 | exit(WARNING); |
| 1309 | } | 1309 | } |
| 1310 | strcpy(ofname, ifname); | 1310 | strcpy(ofname, ifname); |