From 7c7d8bae9863be8019cd75244565a2c471081f42 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Fri, 20 Sep 2019 18:52:24 -0700 Subject: [PATCH] Convert err.c to K&R style. --- src/common/err.c | 166 +++++++++++++++++++++++------------------------ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/src/common/err.c b/src/common/err.c index f630d3b..239ef1d 100644 --- a/src/common/err.c +++ b/src/common/err.c @@ -31,57 +31,57 @@ static int error_count[ERR_NUM_ERRORS]; static char *err_messages[] = { - "Text buffer overflow", - "Store out of dynamic memory", - "Division by zero", - "Illegal object", - "Illegal attribute", - "No such property", - "Stack overflow", - "Call to illegal address", - "Call to non-routine", - "Stack underflow", - "Illegal opcode", - "Bad stack frame", - "Jump to illegal address", - "Can't save while in interrupt", - "Nesting stream #3 too deep", - "Illegal window", - "Illegal window property", - "Print at illegal address", - "@jin called with object 0", - "@get_child called with object 0", - "@get_parent called with object 0", - "@get_sibling called with object 0", - "@get_prop_addr called with object 0", - "@get_prop called with object 0", - "@put_prop called with object 0", - "@clear_attr called with object 0", - "@set_attr called with object 0", - "@test_attr called with object 0", - "@move_object called moving object 0", - "@move_object called moving into object 0", - "@remove_object called with object 0", - "@get_next_prop called with object 0", - "@play_sound called without SOUND_FLAG or OLD_SOUND_FLAG set" + "Text buffer overflow", + "Store out of dynamic memory", + "Division by zero", + "Illegal object", + "Illegal attribute", + "No such property", + "Stack overflow", + "Call to illegal address", + "Call to non-routine", + "Stack underflow", + "Illegal opcode", + "Bad stack frame", + "Jump to illegal address", + "Can't save while in interrupt", + "Nesting stream #3 too deep", + "Illegal window", + "Illegal window property", + "Print at illegal address", + "@jin called with object 0", + "@get_child called with object 0", + "@get_parent called with object 0", + "@get_sibling called with object 0", + "@get_prop_addr called with object 0", + "@get_prop called with object 0", + "@put_prop called with object 0", + "@clear_attr called with object 0", + "@set_attr called with object 0", + "@test_attr called with object 0", + "@move_object called moving object 0", + "@move_object called moving into object 0", + "@remove_object called with object 0", + "@get_next_prop called with object 0", + "@play_sound called without SOUND_FLAG or OLD_SOUND_FLAG set" }; static void print_long (unsigned long value, int base); + /* * init_err * * Initialise error reporting. * */ -void init_err (void) +void init_err(void) { - int i; - - /* Initialize the counters. */ + int i; - for (i = 0; i < ERR_NUM_ERRORS; i++) - error_count[i] = 0; + /* Initialize the counters. */ + for (i = 0; i < ERR_NUM_ERRORS; i++) + error_count[i] = 0; } @@ -94,43 +94,43 @@ void init_err (void) * errnum : Numeric code for error (1 to ERR_NUM_ERRORS) * */ -void runtime_error (int errnum) +void runtime_error(int errnum) { - int wasfirst; - - if (errnum <= 0 || errnum > ERR_NUM_ERRORS) - return; - - if (f_setup.err_report_mode == ERR_REPORT_FATAL - || errnum <= ERR_MAX_FATAL) { - flush_buffer (); - os_fatal (err_messages[errnum - 1]); - return; - } - - wasfirst = (error_count[errnum - 1] == 0); - error_count[errnum - 1]++; - - if ((f_setup.err_report_mode == ERR_REPORT_ALWAYS) - || (f_setup.err_report_mode == ERR_REPORT_ONCE && wasfirst)) { - long pc; - - GET_PC (pc); - print_string ("Warning: "); - print_string (err_messages[errnum - 1]); - print_string (" (PC = "); - print_long (pc, 16); - print_char (')'); - - if (f_setup.err_report_mode == ERR_REPORT_ONCE) { - print_string (" (will ignore further occurrences)"); - } else { - print_string (" (occurrence "); - print_long (error_count[errnum - 1], 10); - print_char (')'); + int wasfirst; + + if (errnum <= 0 || errnum > ERR_NUM_ERRORS) + return; + + if (f_setup.err_report_mode == ERR_REPORT_FATAL + || errnum <= ERR_MAX_FATAL) { + flush_buffer (); + os_fatal (err_messages[errnum - 1]); + return; + } + + wasfirst = (error_count[errnum - 1] == 0); + error_count[errnum - 1]++; + + if ((f_setup.err_report_mode == ERR_REPORT_ALWAYS) + || (f_setup.err_report_mode == ERR_REPORT_ONCE && wasfirst)) { + long pc; + + GET_PC (pc); + print_string ("Warning: "); + print_string (err_messages[errnum - 1]); + print_string (" (PC = "); + print_long (pc, 16); + print_char (')'); + + if (f_setup.err_report_mode == ERR_REPORT_ONCE) { + print_string (" (will ignore further occurrences)"); + } else { + print_string (" (occurrence "); + print_long (error_count[errnum - 1], 10); + print_char (')'); + } + new_line (); } - new_line (); - } } /* report_error */ @@ -142,13 +142,13 @@ void runtime_error (int errnum) */ static void print_long (unsigned long value, int base) { - unsigned long i; - char c; - - for (i = (base == 10 ? 1000000000 : 0x10000000); i != 0; i /= base) - if (value >= i || i == 1) { - c = (value / i) % base; - print_char (c + (c <= 9 ? '0' : 'a' - 10)); + unsigned long i; + char c; + + for (i = (base == 10 ? 1000000000 : 0x10000000); i != 0; i /= base) { + if (value >= i || i == 1) { + c = (value / i) % base; + print_char (c + (c <= 9 ? '0' : 'a' - 10)); + } } - -}/* print_long */ +} /* print_long */ -- 2.34.1