Cleanup, part 1.

8 files changed, 35 insertions, 35 deletions

diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c
index 534d9c55..1b650c01 100644
--- a/src/hyper/htadd.c
+++ b/src/hyper/htadd.c
@@ -79,8 +79,8 @@ extern int line_number;         /* keeps track of which line a page starts on
                                  * including a line number counter into
                                  * HyperDoc. */
 /* for compatibility with HyperDoc */
-Sock *spad_socket = NULL;
-Sock *session_server = NULL;
+openaxiom_sio *spad_socket = NULL;
+openaxiom_sio *session_server = NULL;
 int MenuServerOpened;
 Display *gXDisplay;
 int      gXScreenNumber;
diff --git a/src/hyper/hterror.c b/src/hyper/hterror.c
index f5831f83..46852c46 100644
--- a/src/hyper/hterror.c
+++ b/src/hyper/hterror.c
@@ -204,18 +204,18 @@ token_name(int type)
     }
 }
 void
-htperror(char *msg, int errno)
+htperror(char *msg, int erno)
 {
     char obuff[256];
 
     /* The first thing I do is create the error message */
 
-    if (errno <= Numerrors) {
+    if (erno <= Numerrors) {
         sprintf(obuff, "%s:%s\n", msg, errmess[errno]);
     }
     else {
         sprintf(obuff, "%s:\n", msg);
-        fprintf(stderr, "Unknown error type %d\n", errno);
+        fprintf(stderr, "Unknown error type %d\n", erno);
     }
     fprintf(stderr, "%s", obuff);
 
diff --git a/src/hyper/hyper.c b/src/hyper/hyper.c
index 152ccc35..dbbd4f88 100644
--- a/src/hyper/hyper.c
+++ b/src/hyper/hyper.c
@@ -116,7 +116,7 @@ int gmake_record_file= 0;       /* true when making record files from ht */
 int gverify_record_file = 0;    /* true when verifying record files from ht */
 int gverify_dates = 0;          /* true when we want hypertex to verify ht.db dates */
 
-Sock *session_server;           /* socket connecting to session manager */
+openaxiom_sio *session_server; /* socket connecting to session manager */
 
 int gIsAxiomServer = 0;        /* true iff HyperDoc is acting as a   */
                                 /* an Axiom server */
@@ -402,7 +402,7 @@ make_server_connections(void)
      */
 
     if (open_server(MenuServerName) == -2) {
-        fprintf(stderr, "(HyperDoc) Warning: Not connected to AXIOM Server!\n");
+        fprintf(stderr, "(HyperDoc) Warning: Not connected to OpenAxiom Server!\n");
         MenuServerOpened = 0;
     } else {
         atexit(&clean_socket);
@@ -437,16 +437,16 @@ make_server_connections(void)
             spad_socket = connect_to_local_server(SpadServer,
                                                   MenuServer, wait_time);
             if (gIsAxiomServer && spad_socket == NULL)
-                fprintf(stderr, "(HyperDoc) Error opening AXIOM server. Retrying ...\n");
+                fprintf(stderr, "(HyperDoc) Error opening OpenAxiom server. Retrying ...\n");
             else
                 i = 11;
         }
         if (! spad_socket) {
-            fprintf(stderr, "(HyperDoc) Couldn't connect to AXIOM server!\n");
+            fprintf(stderr, "(HyperDoc) Couldn't connect to OpenAxiom server!\n");
             if (!gIsAxiomServer)
                 MenuServerOpened = 0;
             else {
-                fprintf(stderr, "(HyperDoc) Couldn't connect to AXIOM server!\n");
+                fprintf(stderr, "(HyperDoc) Couldn't connect to OpenAxiom server!\n");
                 exit(-1);
             }
         }
diff --git a/src/hyper/hyper.h b/src/hyper/hyper.h
index 20d7e468..48e142bc 100644
--- a/src/hyper/hyper.h
+++ b/src/hyper/hyper.h
@@ -301,7 +301,7 @@ typedef struct hyperdoc_page {
   TextNode *header;             /* formatted version of page               */
   TextNode *scrolling;          /* Top of scrolling region                 */
   TextNode *footer;             /* top of non-scrolling region at bottom   */
-  Sock *sock;                   /* socket connection for spad buffer       */
+  openaxiom_sio *sock;          /* socket connection for spad buffer       */
   HashTable *fLinkHashTable;         /* active link hash table                  */
   ButtonList *s_button_list;    /* active buttons on page                  */
   ButtonList *button_list;      /* active buttons on page                  */
@@ -411,8 +411,8 @@ extern int gSwitch_to_mono;
 extern unsigned long * spadColors;
 extern int gIsEndOfOutput;
 extern HDWindow *gWindow;
-extern Sock *session_server;
-extern Sock *spad_socket;
+extern openaxiom_sio *session_server;
+extern openaxiom_sio *spad_socket;
 extern HashTable gFileHashTable;
 extern HashTable gImageHashTable;           /* A global hash table for images */
 extern Cursor gNormalCursor;          /* The normal mouse cursor                */
diff --git a/src/hyper/lex.c b/src/hyper/lex.c
index 67de1459..66cfdada 100644
--- a/src/hyper/lex.c
+++ b/src/hyper/lex.c
@@ -856,19 +856,19 @@ spad_busy(void)
     return get_int(session_server);
 }
 
-/* connect to AXIOM , return 0 if succesful, 1 if not */
+/* connect to OpenAxiom , return 0 if succesful, 1 if not */
 int
 connect_spad(void)
 {
     if (!MenuServerOpened) {
-        fprintf(stderr, "(HyperDoc) Warning: Not connected to AXIOM Server!\n");
+        fprintf(stderr, "(HyperDoc) Warning: Not connected to OpenAxiom Server!\n");
         LoudBeepAtTheUser();
         return NotConnected;
     }
     if (spad_socket == NULL) {
         spad_socket = connect_to_local_server(SpadServer, MenuServer, Forever);
         if (spad_socket == NULL) {
-            fprintf(stderr, "(HyperDoc) Warning: Could not connect to AXIOM Server!\n");
+            fprintf(stderr, "(HyperDoc) Warning: Could not connect to OpenAxiom Server!\n");
             LoudBeepAtTheUser();
             return NotConnected;
         }
diff --git a/src/hyper/parse.c b/src/hyper/parse.c
index f2282270..aa270212 100644
--- a/src/hyper/parse.c
+++ b/src/hyper/parse.c
@@ -56,7 +56,7 @@
 TextNode *curr_node;            /* current node being parsed. It is to be the
                                  * next one filled   */
 HashTable *gLinkHashTable;           /* the hash table of active link windows   */
-TextNode *cur_spadcom;          /* The current AXIOM command   */
+TextNode *cur_spadcom;          /* The current OpenAxiom command   */
 
 short int gParserMode;           /* Parser mode flag */
 short int gParserRegion;         /* Parser Region flag scrolling etc */
diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c
index b8795723..5ff51315 100644
--- a/src/hyper/spadbuf.c
+++ b/src/hyper/spadbuf.c
@@ -89,7 +89,7 @@ char buff[MAXLINE];        /* Buffers for collecting input and */
 int  buff_flag[MAXLINE];   /* flags for whether buff chars
                               are printing or non-printing */
 int (*old_handler) ();
-Sock *session_sock, *menu_sock;
+openaxiom_sio *session_sock, *menu_sock;
 char *buff_name = NULL;    /* name for the aixterm */
 
 /*
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index 8969ab34..842b4c4a 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -35,7 +35,7 @@
 
 /* Still a problem with close_client */
 
-/* Communication interface for external AXIOM buffers */
+/* Communication interface for external OpenAxiom buffers */
 #define _SPADINT_C
 #include "axiom-c-macros.h"
 
@@ -51,15 +51,15 @@
 #include "sockio.h"
 
 
-typedef struct sock_list {      /* linked list of Sock */
-    Sock Socket;
+typedef struct sock_list {      /* linked list of openaxiom_sio */
+    openaxiom_sio Socket;
     struct sock_list *next;
 }   Sock_List;
 
 Sock_List *plSock = (Sock_List *) 0;
-Sock *spad_socket = (Sock *) 0; /* to_server socket for SpadServer */
+openaxiom_sio *spad_socket = (openaxiom_sio *) 0; /* to_server socket for SpadServer */
 
-/* issue a AXIOM command to the buffer associated with a page */
+/* issue a OpenAxiom command to the buffer associated with a page */
 void
 issue_spadcommand(HyperDocPage *page, TextNode *command, int immediate,
                   int type)
@@ -95,7 +95,7 @@ issue_spadcommand(HyperDocPage *page, TextNode *command, int immediate,
     gIsEndOfOutput = 0;
 }
 static void
-send_pile(Sock *sock,char * str)
+send_pile(openaxiom_sio *sock,char * str)
 {
     FILE *f;
     char name[512], command[512];
@@ -243,12 +243,12 @@ clear_execution_marks(HashTable *depend_hash)
         }
 }
 
-Sock *
-accept_menu_connection(Sock *server_sock)
+openaxiom_sio *
+accept_menu_connection(openaxiom_sio *server_sock)
 {
     int sock_fd /*, session, ret_code*/;
     Sock_List *pls;
-    /*Sock local_sock;*/
+    /*openaxiom_sio local_sock;*/
 
     /* Could only be InterpWindow */
 
@@ -259,7 +259,7 @@ accept_menu_connection(Sock *server_sock)
         return 0;
     }
     (pls->Socket).socket = sock_fd;
-    get_socket_type((Sock *) pls);
+    get_socket_type((openaxiom_sio *) pls);
 
 #ifdef DEBUG
     fprintf(stderr,
@@ -281,7 +281,7 @@ accept_menu_connection(Sock *server_sock)
     /* need to maintain socket_mask since we roll our own accept */
 
     FD_SET(plSock->Socket.socket, &socket_mask);
-    return (Sock *) plSock;
+    return (openaxiom_sio *) plSock;
 }
 
 static void
@@ -289,13 +289,13 @@ accept_menu_server_connection(HyperDocPage *page)
 {
 
     /*
-     * TTT thinks this code should just provide a Sock to the page. The only
-     * client assumed is a spadbuf. Since spadbuf was invoked with the page
-     * name, it just passes it back here as a check (get_string line).
+     * TTT thinks this code should just provide a openaxiom_sio to the page.
+     * The only client assumed is a spadbuf. Since spadbuf was invoked with
+     * the page name, it just passes it back here as a check (get_string line).
      */
     int ret_code/*, i*/;
     fd_set rd;
-    Sock *sock;
+    openaxiom_sio *sock;
     char *buf_name;
     HyperDocPage *npage;
 
@@ -626,7 +626,7 @@ print_to_string1(TextNode *command,int * sizeBuf)
 }
 
 /*
- * Send a lisp or spad command to the AXIOM server for execution , if
+ * Send a lisp or spad command to the OpenAxiom server for execution , if
  * type is link, then we wait for a HyperDoc card to be returned
  */
 
@@ -779,7 +779,7 @@ switch_frames(void)
         return;
     }
     if (gWindow->fAxiomFrame == -1) {
-        fprintf(stderr, "(HyperDoc) No AXIOM frame associated with top level window!\n");
+        fprintf(stderr, "(HyperDoc) No OpenAxiom frame associated with top level window!\n");
         return;
     }
     send_int(session_server, SwitchFrames);