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 /miscutils | |
| 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 'miscutils')
| -rw-r--r-- | miscutils/dc.c | 6 | ||||
| -rw-r--r-- | miscutils/dutmp.c | 2 | ||||
| -rw-r--r-- | miscutils/mt.c | 2 | ||||
| -rw-r--r-- | miscutils/readlink.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/miscutils/dc.c b/miscutils/dc.c index 0f5f1fc77..d462100a2 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c | |||
| @@ -14,14 +14,14 @@ static unsigned int pointer; | |||
| 14 | static void push(double a) | 14 | static void push(double a) |
| 15 | { | 15 | { |
| 16 | if (pointer >= (sizeof(stack) / sizeof(*stack))) | 16 | if (pointer >= (sizeof(stack) / sizeof(*stack))) |
| 17 | fatalError("stack overflow\n"); | 17 | error_msg_and_die("stack overflow\n"); |
| 18 | stack[pointer++] = a; | 18 | stack[pointer++] = a; |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | static double pop() | 21 | static double pop() |
| 22 | { | 22 | { |
| 23 | if (pointer == 0) | 23 | if (pointer == 0) |
| 24 | fatalError("stack underflow\n"); | 24 | error_msg_and_die("stack underflow\n"); |
| 25 | return stack[--pointer]; | 25 | return stack[--pointer]; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| @@ -120,7 +120,7 @@ static void stack_machine(const char *argument) | |||
| 120 | } | 120 | } |
| 121 | o++; | 121 | o++; |
| 122 | } | 122 | } |
| 123 | fatalError("%s: syntax error.\n", argument); | 123 | error_msg_and_die("%s: syntax error.\n", argument); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | /* return pointer to next token in buffer and set *buffer to one char | 126 | /* return pointer to next token in buffer and set *buffer to one char |
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c index 03d80d87d..efd15dfbf 100644 --- a/miscutils/dutmp.c +++ b/miscutils/dutmp.c | |||
| @@ -35,7 +35,7 @@ extern int dutmp_main(int argc, char **argv) | |||
| 35 | } else { | 35 | } else { |
| 36 | file = open(argv[1], O_RDONLY); | 36 | file = open(argv[1], O_RDONLY); |
| 37 | if (file < 0) { | 37 | if (file < 0) { |
| 38 | fatalError(io_error, argv[1], strerror(errno)); | 38 | error_msg_and_die(io_error, argv[1], strerror(errno)); |
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | 41 | ||
diff --git a/miscutils/mt.c b/miscutils/mt.c index 583674b18..2d35c7c22 100644 --- a/miscutils/mt.c +++ b/miscutils/mt.c | |||
| @@ -75,7 +75,7 @@ extern int mt_main(int argc, char **argv) | |||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (code->name == 0) { | 77 | if (code->name == 0) { |
| 78 | errorMsg("unrecognized opcode %s.\n", argv[1]); | 78 | error_msg("unrecognized opcode %s.\n", argv[1]); |
| 79 | return EXIT_FAILURE; | 79 | return EXIT_FAILURE; |
| 80 | } | 80 | } |
| 81 | 81 | ||
diff --git a/miscutils/readlink.c b/miscutils/readlink.c index 5a798c0ea..bb40b0787 100644 --- a/miscutils/readlink.c +++ b/miscutils/readlink.c | |||
| @@ -39,7 +39,7 @@ int readlink_main(int argc, char **argv) | |||
| 39 | buf = xrealloc(buf, bufsize); | 39 | buf = xrealloc(buf, bufsize); |
| 40 | size = readlink(argv[1], buf, bufsize); | 40 | size = readlink(argv[1], buf, bufsize); |
| 41 | if (size == -1) | 41 | if (size == -1) |
| 42 | fatalError("%s: %s\n", argv[1], strerror(errno)); | 42 | error_msg_and_die("%s: %s\n", argv[1], strerror(errno)); |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | buf[size] = '\0'; | 45 | buf[size] = '\0'; |