White space and comment changes. #ifdef __STDC__ becomes #if __STDC__

== 1.  Get the declarations right in listing.[hc].

1 files changed, 408 insertions, 540 deletions

diff --git a/gas/listing.c b/gas/listing.c
index 343aa62..7724d91 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -97,6 +97,7 @@
 #include "targ-cpu.h"
 
 #ifndef NO_LISTING
+
 #ifndef LISTING_HEADER
 #define LISTING_HEADER "GAS LISTING"
 #endif
@@ -117,24 +118,18 @@
 #endif
 
 
-
-
 /* This structure remembers which .s were used */
-typedef struct file_info_struct 
-{
+typedef struct file_info_struct {
 	char *filename;
 	int linenum;
 	FILE *file;
 	struct file_info_struct *next;
 	int end_pending;
-	
 } file_info_type ;
 
 
-/* this structure rememebrs which line from which file goes into which
-   frag */
-typedef struct list_info_struct
-{
+/* this structure rememebrs which line from which file goes into which frag */
+typedef struct list_info_struct {
 	/* Frag which this line of source is nearest to */
 	fragS *frag;
 	/* The actual line in the source file */
@@ -158,96 +153,82 @@ typedef struct list_info_struct
 	/* Pointer to any error message associated with this line */
 	char *message;
 	
-	enum 
-	    {
-		    EDICT_NONE,
-		    EDICT_SBTTL,
-		    EDICT_TITLE,
-		    EDICT_NOLIST,
-		    EDICT_LIST,
-		    EDICT_EJECT 
-		} edict;
+	enum {
+		EDICT_NONE,
+		EDICT_SBTTL,
+		EDICT_TITLE,
+		EDICT_NOLIST,
+		EDICT_LIST,
+		EDICT_EJECT,
+	} edict;
 	char *edict_arg;
-	
 } list_info_type;
 
-
 static struct list_info_struct *head;
 struct list_info_struct *listing_tail;
 extern int listing;
 extern unsigned int  physical_input_line;
 extern fragS *frag_now;
 
-
 static int paper_width = 200;
 static int paper_height = 60;
 
-
 /* this static array is used to keep the text of data to be printed
-   before the start of the line.
-   It is stored so we can give a bit more info on the next line.  To much, and large
-   initialized arrays will use up lots of paper.
-   */
+   before the start of the line.  It is stored so we can give a bit
+   more info on the next line.  To much, and large initialized arrays
+   will use up lots of paper.  */
 
 static char data_buffer[100];
 static unsigned int data_buffer_size;
 
-
 static void
-    DEFUN(listing_message,(name, message),
-	  char *name AND
-	  char *message)
+    listing_message(name, message)
+char *name;
+char *message;
 {
-	unsigned int l = strlen(name) + strlen(message)+1;
-	char *n =  malloc(l);
+	unsigned int l = strlen(name) + strlen(message) + 1;
+	char *n = malloc(l);
 	strcpy(n,name);
 	strcat(n,message);
-	if(listing_tail != (list_info_type *)NULL) 
-	    {
-		    listing_tail->message = n;
-	    }
-	
-}
-
-
+	if (listing_tail != (list_info_type *)NULL) {
+		listing_tail->message = n;
+	}
 
+	return;
+} /* lising_message() */
 
 void 
-    DEFUN(listing_warning,(message),
-	  char *message)
+    listing_warning(message)
+char *message;
 {
 	listing_message("Warning:", message);
 }
 
-void 
-    DEFUN(listing_error,(message),
-	  char *message)
+void
+    listing_error(message)
+char *message;
 {
 	listing_message("Error:", message);
 }
 
-
-
-
 static file_info_type *file_info_head;
 
 static file_info_type *
-    DEFUN(file_info, (file_name),
-	  char *file_name)
+    file_info(file_name)
+char *file_name;
 {
 	/* Find an entry with this file name */
 	file_info_type *p = file_info_head;
 	
-	while (p != (file_info_type *)NULL) 
-	    {
-		    if (strcmp(p->filename, file_name) == 0)
-			return p;
-		    p = p->next;  
-	    }
+	while (p != (file_info_type *)NULL) {
+		if (strcmp(p->filename, file_name) == 0)
+		    return(p);
+		p = p->next;  
+	}
 	
 	/* Make new entry */
 	
-	p = (file_info_type *)xmalloc(sizeof(file_info_type));
+	p = (file_info_type *) xmalloc(sizeof(file_info_type));
 	p->next = file_info_head;
 	file_info_head = p;
 	p->filename = xmalloc(strlen(file_name)+1);
@@ -256,70 +237,64 @@ static file_info_type *
 	p->end_pending = 0;
 	
 	p->file = fopen(p->filename,"r");
-	return p;
-	
-}
+	return(p);
+} /* file_info() */
 
 
 static void 
-    DEFUN_VOID(new_frag)
+    new_frag()
 {
-	
 	frag_wane(frag_now);
 	frag_new(0);
-	
 }
 
 void 
-    DEFUN(listing_newline,(ps),
-	  char *ps)
+    listing_newline(ps)
+char *ps;
 {
 	char *s = ps;
 	extern char *file_name;
-	static unsigned int last_line =0xffff ;  
+	static unsigned int last_line = 0xffff ;  
 	
 	
 	list_info_type *new;
-	if (physical_input_line != last_line) 
-	    {
-		    last_line = physical_input_line;
-		    new_frag();
-		    
-		    new  = (list_info_type *)malloc(sizeof(list_info_type));
-		    new->frag = frag_now;
-		    new->line = physical_input_line ;
-		    new->file = file_info(file_name);
-		    
-		    if (listing_tail) 
-			{
-				listing_tail->next = new;
-			}
-		    else 
-			{
-				head = new;
-			}
-		    listing_tail = new;
-		    new->next = (list_info_type *)NULL;
-		    new->message = (char *)NULL;
-		    new->edict = EDICT_NONE;    
-		    new->hll_file = (file_info_type*)NULL;
-		    new->hll_line = 0;
-		    new_frag();
-	    }  
-}
+	if (physical_input_line != last_line) {
+		last_line = physical_input_line;
+		new_frag();
+		
+		new  = (list_info_type *) malloc(sizeof(list_info_type));
+		new->frag = frag_now;
+		new->line = physical_input_line ;
+		new->file = file_info(file_name);
+		
+		if (listing_tail) {
+			listing_tail->next = new;
+		} else {
+			head = new;
+		}
+		
+		listing_tail = new;
+		new->next = (list_info_type *) NULL;
+		new->message = (char *) NULL;
+		new->edict = EDICT_NONE;    
+		new->hll_file = (file_info_type*) NULL;
+		new->hll_line = 0;
+		new_frag();
+	}
 
+	return;
+} /* listing_newline() */
 
-/* 
-  This function returns the next source line from the file supplied,
-  truncated to size.  It appends a fake line to the end of each input
-  file to make
-  */
+
+/* This function returns the next source line from the file supplied,
+   truncated to size.  It appends a fake line to the end of each input
+   file to make.  */
 
 static char *
-    DEFUN(buffer_line,(file, line, size),
-	  file_info_type *file AND
-	  char *line AND
-	  unsigned int size)
+    buffer_line(file, line, size)
+file_info_type *file;
+char *line;
+unsigned int size;
 {
 	unsigned int count = 0;
 	int c;
@@ -327,10 +302,9 @@ static char *
 	char *p = line;
 	
 	/* If we couldn't open the file, return an empty line */
-	if  (file->file == (FILE*)NULL) 
-	    {
-		    return "";
-	    }
+	if (file->file == (FILE*) NULL) {
+		return("");
+	}
 	
 	if (file->end_pending == 10) {
 		*p ++ = '\n';
@@ -338,29 +312,29 @@ static char *
 		file->linenum = 0;
 		file->end_pending = 0;
 	}  
+	
 	c = fgetc(file->file);
 	size -= 1;			/* leave room for null */
 	
-	while (c != EOF && c != '\n') 
-	    {
-		    if (count < size) 
-			*p++ = c;
-		    count++;
-		    
-		    c= fgetc(file->file);
-	    }
-	if (c == EOF) 
-	    {
-		    file->end_pending ++;
-		    *p++ = 'E';
-		    *p++ = 'O';
-		    *p++ = 'F';
-	    }
+	while (c != EOF && c != '\n') {
+		if (count < size) 
+		    *p++ = c;
+		count++;
+		
+		c = fgetc(file->file);
+	}
+	
+	if (c == EOF) {
+		file->end_pending ++;
+		*p++ = 'E';
+		*p++ = 'O';
+		*p++ = 'F';
+	}
+	
 	file->linenum++;  
 	*p++ = 0;
-	return line;
-}
-
+	return(line);
+} /* buffer_line() */
 
 static char *fn;
 
@@ -370,55 +344,53 @@ static char *title; 		/* current title */
 static char *subtitle;		/* current subtitle */
 static unsigned int on_page; 	/* number of lines printed on current page */
 
-
 static void
-    DEFUN(listing_page,(list),
-	  list_info_type *list)
+    listing_page(list)
+list_info_type *list;
 {
-	/* Grope around, see if we can see a title or subtitle edict coming up
-	   soon  (we look down 10 lines of the page and see if it's there)*/
-	if ((eject || (on_page >= paper_height)) && paper_height != 0) 
-	    {
-		    unsigned int c = 10;
-		    int had_title = 0;
-		    int had_subtitle = 0;
-		    
-		    page++;
-		    
-		    while (c != 0 && list) 
-			{
-				if (list->edict == EDICT_SBTTL && !had_subtitle) 
-				    {
-					    had_subtitle = 1;
-					    subtitle = list->edict_arg;
-				    }
-				if (list->edict == EDICT_TITLE && !had_title) 
-				    {
-					    had_title = 1;
-					    title = list->edict_arg;
-				    }
-				list = list->next;
-				c--;
-			}    
-		    
-		    
-		    if (page > 1) 
-			{
-				printf("\f");
+	/* Grope around, see if we can see a title or subtitle edict
+	   coming up soon  (we look down 10 lines of the page and see
+	   if it's there).  */
+
+	if ((eject || (on_page >= paper_height)) && paper_height != 0) {
+		unsigned int c = 10;
+		int had_title = 0;
+		int had_subtitle = 0;
+		
+		page++;
+		
+		while (c != 0 && list) {
+			if (list->edict == EDICT_SBTTL && !had_subtitle) {
+				had_subtitle = 1;
+				subtitle = list->edict_arg;
 			}
-		    
-		    printf("%s %s \t\t\tpage %d\n", LISTING_HEADER, fn, page);
-		    printf("%s\n", title);
-		    printf("%s\n", subtitle);
-		    on_page = 3;
-		    eject = 0;
-	    }
-}
+			
+			if (list->edict == EDICT_TITLE && !had_title) {
+				had_title = 1;
+				title = list->edict_arg;
+			}
+			list = list->next;
+			--c;
+		}    
+		
+		if (page > 1) {
+			printf("\f");
+		}
+		
+		printf("%s %s \t\t\tpage %d\n", LISTING_HEADER, fn, page);
+		printf("%s\n", title);
+		printf("%s\n", subtitle);
+		on_page = 3;
+		eject = 0;
+	}
+
+	return;
+} /* listing_page() */
 
 
 static unsigned int 
-    DEFUN(calc_hex,(list),
-	  list_info_type *list)
+    calc_hex(list)
+list_info_type *list;
 {
 	list_info_type *first = list;
 	list_info_type *last = first;
@@ -427,7 +399,7 @@ static unsigned int
 	fragS *frag;
 	fragS *frag_ptr;
 	
-	unsigned    int    byte_in_frag = 0;
+	unsigned int byte_in_frag = 0;
 	
 	int anything = 0;      
 	
@@ -441,51 +413,42 @@ static unsigned int
 	data_buffer_size = 0;
 	
 	/* Dump all the frags which belong to this line */
-	while (frag_ptr != (fragS *)NULL  && frag_ptr->line == first)
-	    {
-		    /* Print as many bytes from the fixed part as is sensible */
-		    while(byte_in_frag < frag_ptr->fr_fix && data_buffer_size < sizeof(data_buffer)-10)
-			{
-				if (address == ~0)
-				    {
-					    address = frag_ptr->fr_address;
-				    }
-				
-				sprintf(data_buffer + data_buffer_size,
-					"%02X",
-					(frag_ptr->fr_literal[byte_in_frag]) & 0xff);
-				data_buffer_size += 2;
-				byte_in_frag++;
+	while (frag_ptr != (fragS *)NULL  && frag_ptr->line == first) {
+		/* Print as many bytes from the fixed part as is sensible */
+		while(byte_in_frag < frag_ptr->fr_fix && data_buffer_size < sizeof(data_buffer)-10) {
+			if (address == ~0) {
+				address = frag_ptr->fr_address;
 			}
-		    /* Print as many bytes from the variable part as is sensible */
-		    while (byte_in_frag < frag_ptr->fr_var * frag_ptr->fr_offset 
-			   && data_buffer_size < sizeof(data_buffer)-10)
-			{
-				if (address == ~0)
-				    {
-					    address =  frag_ptr->fr_address;
-				    }
-				data_buffer[data_buffer_size++] = '*';
-				data_buffer[data_buffer_size++] = '*';
-				
-				byte_in_frag++;
+			
+			sprintf(data_buffer + data_buffer_size, "%02X", (frag_ptr->fr_literal[byte_in_frag]) & 0xff);
+			data_buffer_size += 2;
+			byte_in_frag++;
+		}
+		
+		/* Print as many bytes from the variable part as is sensible */
+		while (byte_in_frag < frag_ptr->fr_var * frag_ptr->fr_offset 
+		       && data_buffer_size < sizeof(data_buffer)-10) {
+			if (address == ~0) {
+				address =  frag_ptr->fr_address;
 			}
-		    frag_ptr = frag_ptr->fr_next;
-	    }
+			data_buffer[data_buffer_size++] = '*';
+			data_buffer[data_buffer_size++] = '*';
+			
+			byte_in_frag++;
+		}
+		
+		frag_ptr = frag_ptr->fr_next;
+	}
+	
 	data_buffer[data_buffer_size++] = 0;
 	return address;
-}
-
-
-
-
-
+} /* calc_hex() */
 
 static void
-    DEFUN(print_lines,(list, string, address),
-	  list_info_type *list AND
-	  char *string AND
-	  unsigned int address)
+    print_lines(list, string, address)
+list_info_type *list;
+char *string;
+unsigned int address;
 {
 	unsigned int idx;
 	unsigned int nchars;
@@ -495,128 +458,106 @@ static void
 	
 	/* Print the stuff on the first line */
 	listing_page(list);
-	nchars = (LISTING_WORD_SIZE*2 +1)  * LISTING_LHS_WIDTH ;
+	nchars = (LISTING_WORD_SIZE * 2 + 1)  * LISTING_LHS_WIDTH ;
+	
 	/* Print the hex for the first line */
-	if (address == ~0)  
-	    {
-		    printf("% 4d     ", list->line);
-		    for (idx = 0; idx < nchars; idx++)
-			printf(" ");
-		    
-		    printf("\t%s\n", string ? string : "");
-		    on_page++;
-		    listing_page(0);
-		    
-	    }
-	else 
-	    {
-		    if (had_errors()) 
-			{
-				printf("% 4d ???? ", list->line);
-			}
-		    else 
-			{
-				printf("% 4d %04x ", list->line, address);
+	if (address == ~0) {
+		printf("% 4d     ", list->line);
+		for (idx = 0; idx < nchars; idx++)
+		    printf(" ");
+		
+		printf("\t%s\n", string ? string : "");
+		on_page++;
+		listing_page(0);
+	} else {
+		if (had_errors()) {
+			printf("% 4d ???? ", list->line);
+		} else {
+			printf("% 4d %04x ", list->line, address);
+		}
+		
+		/* And the data to go along with it */
+		idx = 0;
+		
+		while (*src && idx < nchars) {
+			printf("%c%c", src[0], src[1]);
+			src += 2;
+			byte_in_word++;
+			
+			if (byte_in_word == LISTING_WORD_SIZE) {
+				printf(" ");
+				idx++;
+				byte_in_word = 0;
 			}
-		    
-		    /* And the data to go along with it */
-		    idx = 0;
-		    
-		    while (*src && idx < nchars)
-			{
+			idx+=2;
+		}	    
+		
+		for (;idx < nchars; idx++) 
+		    printf(" ");
+		
+		printf("\t%s\n", string ? string : "");
+		on_page++;
+		listing_page(list);  
+		if (list->message) {
+			printf("****  %s\n",list->message);
+			listing_page(list);
+			on_page++;
+		}
+		
+		for (lines = 0; lines < LISTING_LHS_CONT_LINES && *src; lines++) {
+			nchars = ((LISTING_WORD_SIZE*2) +1)  * LISTING_LHS_WIDTH_SECOND -1;
+			idx = 0;
+			/* Print any more lines of data, but more compactly */
+			printf("% 4d      ", list->line);
+			
+			while (*src && idx < nchars) {
 				printf("%c%c", src[0], src[1]);
-				src += 2;
-				byte_in_word++;
-				if (byte_in_word == LISTING_WORD_SIZE)  
-				    {
-					    printf(" ");
-					    idx++;
-					    byte_in_word = 0;
-				    }
+				src+=2;
 				idx+=2;
-			}	    
-		    
-		    for (;idx < nchars; idx++) 
-			printf(" ");
-		    
-		    printf("\t%s\n", string ? string : "");
-		    on_page++;
-		    listing_page(list);  
-		    if (list->message) 
-			{
-				printf("****  %s\n",list->message);
-				listing_page(list);
-				on_page++;
-			}
-		    
-		    for (lines = 0;
-			 lines < LISTING_LHS_CONT_LINES 
-			 && *src;
-			 lines++) {
-			    nchars = ((LISTING_WORD_SIZE*2) +1)  * LISTING_LHS_WIDTH_SECOND -1;
-			    idx = 0;
-			    /* Print any more lines of data, but more compactly */
-			    printf("% 4d      ", list->line);
-			    
-			    while (*src && idx < nchars)
-				{
-					printf("%c%c", src[0], src[1]);
-					src+=2;
-					idx+=2;
-					byte_in_word++;
-					if (byte_in_word == LISTING_WORD_SIZE)  
-					    {
-						    printf(" ");
-						    idx++;
-						    byte_in_word = 0;
-					    }
+				byte_in_word++;
+				if (byte_in_word == LISTING_WORD_SIZE) {
+					printf(" ");
+					idx++;
+					byte_in_word = 0;
 				}
-			    
-			    printf("\n");
-			    on_page++;
-			    listing_page(list);
-			    
-		    }
-		    
-		    
-	    }
-}
-
-
-
-
+			}
+			
+			printf("\n");
+			on_page++;
+			listing_page(list);
+		}
+	}
+} /* print_lines() */
 
 
 static void
-    DEFUN_VOID(list_symbol_table)
+    list_symbol_table()
 {
 	extern symbolS *symbol_rootP;
+	symbolS *ptr;
 	
-	symbolS *ptr ;
 	eject = 1;
 	listing_page(0);
 	printf("DEFINED SYMBOLS\n");
 	on_page++;
 	
-	for (ptr = symbol_rootP; ptr != (symbolS*)NULL; ptr = symbol_next(ptr))
-	    {
-		    if (ptr->sy_frag->line) 
-			{
-				if (strlen(S_GET_NAME(ptr))) 
-				    {
-					    printf("%20s:%-5d  %2d:%08x %s \n",
-						   ptr->sy_frag->line->file->filename,
-						   ptr->sy_frag->line->line,
-						   S_GET_SEGMENT(ptr),
-						   S_GET_VALUE(ptr),
-						   S_GET_NAME(ptr));
-					    
-					    on_page++;
-					    listing_page(0);
-				    }      
-			}
-		    
-	    }
+	for (ptr = symbol_rootP; ptr != (symbolS*)NULL; ptr = symbol_next(ptr)) {
+		if (ptr->sy_frag->line) {
+			if (strlen(S_GET_NAME(ptr))) {
+				printf("%20s:%-5d  %2d:%08x %s \n",
+				       ptr->sy_frag->line->file->filename,
+				       ptr->sy_frag->line->line,
+				       S_GET_SEGMENT(ptr),
+				       S_GET_VALUE(ptr),
+				       S_GET_NAME(ptr));
+				
+				on_page++;
+				listing_page(0);
+			}      
+		}
+		
+	}
+	
 	printf("\n");
 	on_page++;
 	listing_page(0);
@@ -624,49 +565,49 @@ static void
 	on_page++;
 	listing_page(0);
 	
-	for (ptr = symbol_rootP; ptr != (symbolS*)NULL; ptr = symbol_next(ptr))
-	    {
-		    if (ptr && strlen(S_GET_NAME(ptr)) != 0) 
-			{
-				if (ptr->sy_frag->line == 0) 
-				    {
-					    printf("%s\n",	     S_GET_NAME(ptr));
-					    on_page++;
-					    listing_page(0);
-				    }
+	for (ptr = symbol_rootP; ptr != (symbolS*)NULL; ptr = symbol_next(ptr)) {
+		if (ptr && strlen(S_GET_NAME(ptr)) != 0) {
+			if (ptr->sy_frag->line == 0) {
+				printf("%s\n",	     S_GET_NAME(ptr));
+				on_page++;
+				listing_page(0);
 			}
-	    }
-}
+		}
+	}
+
+	return;
+} /* list_symbol_table() */
 
 void 
-    DEFUN(print_source,(current_file, list, buffer, width),
-	  file_info_type *current_file AND
-	  list_info_type *list AND
-	  char *buffer AND
-	  unsigned int width)
+    print_source(current_file, list, buffer, width)
+file_info_type *current_file;
+list_info_type *list;
+char *buffer;
+unsigned int width;
 {
 	if (current_file->file) {  
-		while (current_file->linenum < list->hll_line)
-		    {
-			    char * p = buffer_line(current_file, buffer, width);
-			    printf("%4d:%-13s **** %s\n", current_file->linenum, current_file->filename, p);
-			    on_page++;
-			    listing_page(list);	
-		    }
+		while (current_file->linenum < list->hll_line) {
+			char * p = buffer_line(current_file, buffer, width);
+			printf("%4d:%-13s **** %s\n", current_file->linenum, current_file->filename, p);
+			on_page++;
+			listing_page(list);	
+		}
 	}
-}
+	
+	return;
+} /* print_source() */
 
 /* Sometimes the user doesn't want to be bothered by the debugging
    records inserted by the compiler, see if the line is suspicioous */
 
 static int
-    DEFUN(debugging_pseudo,(line),
-	  char *line)
+    debugging_pseudo(line)
+char *line;
 {
 	while (isspace(*line)) 
 	    line++;
 	
-	if(*line != '.') return 0;
+	if (*line != '.') return 0;
 	
 	line++;
 	
@@ -681,110 +622,96 @@ static int
 	if (strncmp(line, "dim",3) ==0) return 1;
 	if (strncmp(line, "tag",3) == 0) return 1;
 	
-	return 0;
-	
-}
+	return(0);
+} /* debugging_pseudo() */
 
 void 
-    DEFUN(listing_listing,(name),
-	  char *name)
+    listing_listing(name)
+char *name;
 {
-	list_info_type *list = head;
-	file_info_type *current_hll_file = (file_info_type *)NULL;
-	
-	unsigned  int page= 1;
-	unsigned int prev  = 0;
-	char *message;
 	char *buffer;
+	char *message;
 	char *p;
-	unsigned int addr = 0;  
+	file_info_type *current_hll_file = (file_info_type *) NULL;
 	int on_page = 0;
 	int show_listing = 1;
+	list_info_type *list = head;
+	unsigned int addr = 0;  
+	unsigned int page = 1;
+	unsigned int prev  = 0;
 	unsigned int width;
 	
 	buffer = malloc(LISTING_RHS_WIDTH);
 	eject = 1;
 	list = head;
 	
-	while (list != (list_info_type *)NULL && 0) 
-	    {
-		    if (list->next)
-			list->frag = list->next->frag;  
-		    list = list->next;
-		    
-	    }
+	while (list != (list_info_type *)NULL && 0) {
+		if (list->next)
+		    list->frag = list->next->frag;  
+		list = list->next;
+	}
 	
 	list = head->next;
 	
-	
-	while ( list)
-	    {
-		    width =  LISTING_RHS_WIDTH > paper_width ?  paper_width :
-			LISTING_RHS_WIDTH;
-		    
-		    switch (list->edict) {
-		    case EDICT_LIST:
-			    show_listing++;
-			    break;
-		    case EDICT_NOLIST:
-			    show_listing--;
-			    break;
-		    case EDICT_EJECT:
-			    break;
-		    case EDICT_NONE:
-			    break;
-		    case EDICT_TITLE:
-			    title = list->edict_arg;
-			    break;
-		    case EDICT_SBTTL:
-			    subtitle = list->edict_arg;
-			    break;
-		    default:
-			    abort();
-		    }
-		    
-		    if (show_listing > 0) 
-			{
-				/* Scan down the list and print all the stuff which can be done
-				   with this line (or lines) */
-				message = 0;
-				
-				if (list->hll_file) 
-				    {
-					    current_hll_file = list->hll_file;
-				    }
-				
-				if (current_hll_file && list->hll_line && listing & LISTING_HLL)
-				    {
-					    print_source(current_hll_file, list, buffer, width);
-				    }
-				
-				p = buffer_line(list->file, buffer, width);      
-				
-				if (! ((listing & LISTING_NODEBUG) && debugging_pseudo(p)))
-				    {      
-					    print_lines(list, p,  calc_hex(list));
-				    }
-				
-				if (list->edict == EDICT_EJECT) 
-				    {
-					    eject = 1;
-				    }    
+	while (list) {
+		width =  LISTING_RHS_WIDTH > paper_width ?  paper_width : LISTING_RHS_WIDTH;
+		
+		switch (list->edict) {
+		case EDICT_LIST:
+			show_listing++;
+			break;
+		case EDICT_NOLIST:
+			show_listing--;
+			break;
+		case EDICT_EJECT:
+			break;
+		case EDICT_NONE:
+			break;
+		case EDICT_TITLE:
+			title = list->edict_arg;
+			break;
+		case EDICT_SBTTL:
+			subtitle = list->edict_arg;
+			break;
+		default:
+			abort();
+		}
+		
+		if (show_listing > 0) {
+			/* Scan down the list and print all the stuff which can be done
+			   with this line (or lines) */
+			message = 0;
+			
+			if (list->hll_file) {
+				current_hll_file = list->hll_file;
 			}
-		    else 
-			{
-				
-				p = buffer_line(list->file, buffer, width);      
+			
+			if (current_hll_file && list->hll_line && listing & LISTING_HLL) {
+				print_source(current_hll_file, list, buffer, width);
 			}
-		    
-		    list = list->next;
-	    }
+			
+			p = buffer_line(list->file, buffer, width);      
+			
+			if (! ((listing & LISTING_NODEBUG) && debugging_pseudo(p))) {      
+				print_lines(list, p,  calc_hex(list));
+			}
+			
+			if (list->edict == EDICT_EJECT) {
+				eject = 1;
+			}    
+		} else {
+			
+			p = buffer_line(list->file, buffer, width);      
+		}
+		
+		list = list->next;
+	}
 	free(buffer);
-}
+} /* listing_listing() */
 
 void 
-    DEFUN(listing_print,(name),
-	  char *name)
+    listing_print(name)
+char *name;
 {
 	title = "";
 	subtitle = "";  
@@ -803,174 +730,115 @@ void
 	    {
 		    list_symbol_table();
 	    }
-}  
+} /* listing_print() */
 
 
 void
-    DEFUN(listing_file,(name),
-	  char *name)
+    listing_file(name)
+char *name;
 {
 	fn = name;  
 }
 
 void 
-    DEFUN_VOID(listing_eject)
+    listing_eject()
 {
 	listing_tail->edict = EDICT_EJECT;  
+	return;
 }
 
 void
-    DEFUN_VOID(listing_flags)
+    listing_flags()
 {
 	
 }
+
 void
-    DEFUN(listing_list,(on),
-	  unsigned int on)
+    listing_list(on)
+unsigned int on;
 {
 	listing_tail->edict = on ? EDICT_LIST : EDICT_NOLIST;
 }
 
 
 void
-    DEFUN_VOID(listing_psize)
+    listing_psize()
 {
 	paper_height = get_absolute_expression();
 	
-	if (paper_height < 0 || paper_height > 1000) 
-	    {
-		    paper_height = 0;
-		    as_warn("strantge paper height, set to no form");
-	    }
-	if (*input_line_pointer == ',') 
-	    {
-		    input_line_pointer++;
-		    paper_width = get_absolute_expression();
-	    }
-}
+	if (paper_height < 0 || paper_height > 1000) {
+		paper_height = 0;
+		as_warn("strantge paper height, set to no form");
+	}
+	
+	if (*input_line_pointer == ',') {
+		input_line_pointer++;
+		paper_width = get_absolute_expression();
+	}
+	
+	return;
+} /* listing_psize() */
 
 
 void
-    DEFUN(listing_title,(depth),
-	  unsigned int depth)
+    listing_title(depth)
+unsigned int depth;
 {
 	char *start;
 	char *title;
 	unsigned int length;
 	
 	SKIP_WHITESPACE();
+	
 	if (*input_line_pointer=='\"') {
 		input_line_pointer++;
 		start = input_line_pointer;
 		
-		while (*input_line_pointer) 
-		    {
-			    if (*input_line_pointer == '\"') 
-				{
-					length = input_line_pointer - start;
-					title = malloc(length + 1);
-					memcpy(title, start, length);
-					title[length] = 0;
-					listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
-					listing_tail->edict_arg = title;
-					input_line_pointer++;
-					demand_empty_rest_of_line();
-					return;      
-				}
-			    else if (*input_line_pointer == '\n') 
-				{
-					as_bad("New line in title");
-					demand_empty_rest_of_line();
-					return;
-				}
-			    else 
-				{
-					input_line_pointer++;
-				}
-		    }
+		while (*input_line_pointer) {
+			if (*input_line_pointer == '\"') {
+				length = input_line_pointer - start;
+				title = malloc(length + 1);
+				memcpy(title, start, length);
+				title[length] = 0;
+				listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
+				listing_tail->edict_arg = title;
+				input_line_pointer++;
+				demand_empty_rest_of_line();
+				return;      
+			} else if (*input_line_pointer == '\n') {
+				as_bad("New line in title");
+				demand_empty_rest_of_line();
+				return;
+			} else {
+				input_line_pointer++;
+			}
+		}
+	} else {
+		as_bad("expecting title in quotes");
 	}
-	else 
-	    {
-		    as_bad("expecting title in quotes");
-	    }
-}
+	
+	return;
+} /* listing_title() */
 
 
 
 void
-    DEFUN(listing_source_line,(line),
-	  unsigned int line)
+    listing_source_line(line)
+unsigned int line;
 {
 	new_frag();
 	listing_tail->hll_line = line;
 	new_frag();
-	
-}
+	return;
+} /* lising_source_line() */
 
 void
-    DEFUN(listing_source_file,(file),
-	  char *file)
+    listing_source_file(file)
+char *file;
 {
 	listing_tail->hll_file = file_info(file);
 }
 
+#endif /* not NO_LISTING */
 
-
-#else
-
-
-/* Dummy functions for when compiled without listing enabled */
-
-void 
-    DEFUN_VOID(listing_flags)
-{
-	s_ignore();  
-}
-
-void DEFUN_VOID(listing_list)
-{
-	s_ignore();  
-}
-
-void DEFUN_VOID(listing_eject)
-{
-	s_ignore();  
-}
-void DEFUN(listing_psize)
-{
-	s_ignore();
-}
-
-void DEFUN(listing_title, (depth),
-	   unsigned int depth)
-{
-	s_ignore();  
-}
-void
-    DEFUN(listing_file,(name),
-	  char *name)
-{
-	
-}
-
-void DEFUN(listing_newline,(name),
-	   char *name)
-{
-	
-}
-
-void DEFUN(listing_source_line,(n),
-	   unsigned int n)
-{
-	
-}
-void DEFUN(listing_source_file, (n),
-	   char *n)
-{
-	
-}
-
-
-
-#endif
-
+/* end of listing.c */