More minor twiddling.

diff --git a/bascat.c b/bascat.c
index 139d58d..b685a5c 100644 (file)
--- a/bascat.c
+++ b/bascat.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bascat.c,v 1.3 1999/10/28 10:18:17 mdw Exp $
+ * $Id: bascat.c,v 1.4 1999/10/28 10:42:23 mdw Exp $
  *
  * Display BBC BASIC programs more or less anywhere
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: bascat.c,v $
+ * Revision 1.4  1999/10/28 10:42:23  mdw
+ * More minor twiddling.
+ *
  * Revision 1.3  1999/10/28 10:18:17  mdw
  * Minor name changes for new coding standards.
  *
@@ -79,7 +82,7 @@
  * carried out on an A440 with RISC OS 3.1
  */
 
-static const char *bcTok__base[] = {
+static const char *tok_base[] = {
   "OTHERWISE",
   "AND", "DIV", "EOR", "MOD", "OR", "ERROR", "LINE", "OFF",
   "STEP", "SPC", "TAB(", "ELSE", "THEN", "*", "OPENIN", "PTR",
@@ -99,18 +102,18 @@ static const char *bcTok__base[] = {
   "RETURN", "RUN", "STOP", "COLOUR", "TRACE", "UNTIL", "WIDTH", "OSCLI"
 };
 
-static const char *bcTok__c6[] = {
+static const char *tok_c6[] = {
   "SUM", "BEAT"
 };
 
-static const char *bcTok__c7[] = {
+static const char *tok_c7[] = {
   "APPEND", "AUTO",
   "CRUNCH", "DELETE", "EDIT", "HELP", "LIST", "LOAD", "LVAR", "NEW",
   "OLD", "RENUMBER", "SAVE", "TEXTLOAD", "TEXTSAVE", "TWIN", "TWINO",
     "INSTALL"
 };
 
-static const char *bcTok__c8[] = {
+static const char *tok_c8[] = {
   "CASE", "CIRCLE",
   "FILL", "ORIGIN", "POINT", "RECTANGLE", "SWAP", "WHILE", "WAIT", "MOUSE",
   "QUIT", "SYS", "INSTALL", "LIBRARY", "TINT", "ELLIPSE", "BEATS", "TEMPO",
@@ -283,7 +286,7 @@ static int decode(int byte, FILE * fp)
            /* Fall through here */
          default:
          keyword:
-           keyword(bcTok__base[byte - 0x7F], fp);
+           keyword(tok_base[byte - 0x7F], fp);
            break;
        }
       } else {
@@ -307,15 +310,15 @@ static int decode(int byte, FILE * fp)
     /* --- Double-byte token states --- */
 
     case s_c6:
-      return (mbtok(byte, bcTok__c6, ITEMS(bcTok__c6), fp));
+      return (mbtok(byte, tok_c6, ITEMS(tok_c6), fp));
       break;
 
     case s_c7:
-      return (mbtok(byte, bcTok__c7, ITEMS(bcTok__c7), fp));
+      return (mbtok(byte, tok_c7, ITEMS(tok_c7), fp));
       break;
 
     case s_c8:
-      return (mbtok(byte, bcTok__c8, ITEMS(bcTok__c8), fp));
+      return (mbtok(byte, tok_c8, ITEMS(tok_c8), fp));
       break;
 
     /* --- Encoded line number states --- */
@@ -440,7 +443,7 @@ static void file(FILE *in, FILE *out)
     die("Found data after end of program");
 }
 
-/* --- @sigPipe@ --- *
+/* --- @sig_pipe@ --- *
  *
  * Arguments:   @int s@ = signal number
  *
@@ -449,7 +452,7 @@ static void file(FILE *in, FILE *out)
  * Use:         Handles SIGPIPE signals, and gracefully kills the program.
  */
 
-static void sigPipe(int s)
+static void sig_pipe(int s)
 {
   (void) s;
   exit(0);                             /* Gracefully, oh yes */
@@ -586,7 +589,7 @@ int main(int argc, char *argv[])
        out = stdout;
       else {
        flags |= f_tty;
-       signal(SIGPIPE, sigPipe);
+       signal(SIGPIPE, sig_pipe);
       }
     } else
       out = stdout;