From 155bf2967dd320bc667b5a0ae08ecdb93b46091e Mon Sep 17 00:00:00 2001
From: aafemt <aafemt@users.sourceforge.net>
Date: Thu, 18 Sep 2003 10:28:34 +0000
Subject: [PATCH] 'struct' removal

---
 src/misc/align.cpp    | 12 ++++++------
 src/misc/blrtable.cpp |  6 +++---
 src/misc/print.cpp    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/misc/align.cpp b/src/misc/align.cpp
index 2dcd32e756..6822c9de56 100644
--- a/src/misc/align.cpp
+++ b/src/misc/align.cpp
@@ -17,7 +17,7 @@
  * Contributor(s): ______________________________________.
  */
 /*
-$Id: align.cpp,v 1.2 2003-09-01 07:52:18 brodsom Exp $
+$Id: align.cpp,v 1.3 2003-09-18 10:28:34 aafemt Exp $
 */
 
 #include "firebird.h"
@@ -34,7 +34,7 @@ typedef struct xyz {
 #define EVEN		"((n+1) & ~1)"
 #define NO_OP		"(n)"
 
-typedef struct alignment {
+struct alignment {
 	short rule_offset;
 	short rule_length;
 	short rule_faults;
@@ -42,9 +42,9 @@ typedef struct alignment {
 	short rule_double_align;
 	char *rule_rule;
 	char *rule_system;
-} ALIGNMENT;
+};
 
-static ALIGNMENT rules[] = {
+static alignment rules[] = {
 	1, 9, 0, 4, 4, NO_OP, "VMS",	/* VMS */
 	2, 10, 0, 4, 4, EVEN, "MC 68K",	/* Generic Motorola */
 	4, 12, 0, 4, 4, MAJOR_MINOR, "VAX Ultrix, 386i, RT",	/* VAX Ultrix */
@@ -69,10 +69,10 @@ int main(int argc, char *argv[])
 	long vector[3];
 #endif
 	short offset, length, faults;
-	ALIGNMENT *rule;
+	alignment* rule;
 
 	offset = (int) &((XYZ) NULL)->b;
-	length = sizeof(struct xyz);
+	length = sizeof(xyz);
 	faults = check_double();
 
 	for (rule = rules; rule->rule_offset; ++rule)
diff --git a/src/misc/blrtable.cpp b/src/misc/blrtable.cpp
index 6b3dbd319c..39d1f3837b 100644
--- a/src/misc/blrtable.cpp
+++ b/src/misc/blrtable.cpp
@@ -57,7 +57,7 @@ enum {
 
 static void print(const SCHAR **, int, const SCHAR *);
 
-typedef struct {
+struct VERB {
 	UCHAR blr;
 	SCHAR const *internal;
 	SCHAR const *internal2;
@@ -65,7 +65,7 @@ typedef struct {
 	SCHAR const *count;
 	SCHAR const *type;
 	SCHAR const *sub_type;
-} VERB;
+};
 
 static const VERB verbs[] = {
 	PAIR(nod_assignment, blr_assignment, e_asgn_length, 2, STATEMENT, VALUE),
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
  *	Spit out a conversion table.
  *
  **************************************/
-	const VERB *verb;
+	const VERB* verb;
 	int max, blr;
 
 	for (blr = 0; blr < FB_NELEM(table); blr++) {
diff --git a/src/misc/print.cpp b/src/misc/print.cpp
index 0aedec5ced..da585c2496 100644
--- a/src/misc/print.cpp
+++ b/src/misc/print.cpp
@@ -202,7 +202,7 @@ static void event_table_dump(void)
 	prt_que("\tProcesses", &EVENT_header->evh_processes);
 	prt_que("\tEvents", &EVENT_header->evh_events);
 
-	for (offset = sizeof(struct evh); offset < EVENT_header->evh_length;
+	for (offset = sizeof(evh); offset < EVENT_header->evh_length;
 		 offset += block->hdr_length) {
 		ib_printf("\n%.5ld ", offset);
 		block = (HDR *) ABS_PTR(offset);