From 57bccbcdf288763979fb84f85758cd100c005c31 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 1 Apr 2001 01:41:05 +0000 Subject: 2001-03-31 Roland McGrath * assert.h: Fix obsolescent #endif syntax. * default_pager.c: Likewise. * queue.h: Likewise. * load.c: Likewise. --- serverboot/assert.h | 16 ++++++++-------- serverboot/default_pager.c | 30 +++++++++++++++--------------- serverboot/load.c | 4 ++-- serverboot/queue.h | 10 +++++----- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/serverboot/assert.h b/serverboot/assert.h index 9bcab69e..9f70aec3 100644 --- a/serverboot/assert.h +++ b/serverboot/assert.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -38,9 +38,9 @@ extern void Assert(); #ifdef lint #define assert_static(x) -#else lint +#else /* lint */ #define assert_static(x) assert(x) -#endif lint +#endif /* lint */ #else /* ASSERTIONS */ #define assert(ex) diff --git a/serverboot/default_pager.c b/serverboot/default_pager.c index d5dbcf9b..a7625447 100644 --- a/serverboot/default_pager.c +++ b/serverboot/default_pager.c @@ -655,7 +655,7 @@ struct dpager { #ifdef CHECKSUM vm_offset_t *checksum; /* checksum - parallel to block map */ #define NO_CHECKSUM ((vm_offset_t)-1) -#endif CHECKSUM +#endif /* CHECKSUM */ }; typedef struct dpager *dpager_t; @@ -752,7 +752,7 @@ pager_alloc(pager, part, size) mapptr[i] = NO_CHECKSUM; } pager->checksum = mapptr; -#endif CHECKSUM +#endif /* CHECKSUM */ } /* @@ -908,7 +908,7 @@ pager_extend(pager, new_size) new_mapptr[i] = 0; kfree((char *)old_mapptr, INDIRECT_PAGEMAP_SIZE(old_size)); pager->checksum = new_mapptr; -#endif CHECKSUM +#endif /* CHECKSUM */ #if DEBUG_READER_CONFLICTS pager->writer = FALSE; #endif @@ -979,7 +979,7 @@ pager_extend(pager, new_size) for (i = 1; i < INDIRECT_PAGEMAP_ENTRIES(new_size); i++) new_mapptr[i] = 0; pager->checksum = new_mapptr; -#endif CHECKSUM +#endif /* CHECKSUM */ #if DEBUG_READER_CONFLICTS pager->writer = FALSE; #endif @@ -1008,7 +1008,7 @@ pager_extend(pager, new_size) new_mapptr[i] = NO_CHECKSUM; kfree((char *)old_mapptr, PAGEMAP_SIZE(old_size)); pager->checksum = new_mapptr; -#endif CHECKSUM +#endif /* CHECKSUM */ #if DEBUG_READER_CONFLICTS pager->writer = FALSE; #endif @@ -1254,7 +1254,7 @@ compute_checksum(addr, size) return (checksum); } -#endif CHECKSUM +#endif /* CHECKSUM */ /* * Given an offset within a paging object, find the @@ -1364,7 +1364,7 @@ pager_write_offset(pager, offset) for (j = 0; j < PAGEMAP_ENTRIES; j++) cksumptr[j] = NO_CHECKSUM; } -#endif CHECKSUM +#endif /* CHECKSUM */ } f_page %= PAGEMAP_ENTRIES; } @@ -1465,7 +1465,7 @@ pager_dealloc(pager) } kfree((char *)pager->checksum, INDIRECT_PAGEMAP_SIZE(pager->size)); -#endif CHECKSUM +#endif /* CHECKSUM */ } else { mapptr = pager->map; @@ -1478,7 +1478,7 @@ pager_dealloc(pager) kfree((char *)pager->map, PAGEMAP_SIZE(pager->size)); #ifdef CHECKSUM kfree((char *)pager->checksum, PAGEMAP_SIZE(pager->size)); -#endif CHECKSUM +#endif /* CHECKSUM */ } } @@ -1573,7 +1573,7 @@ default_read(ds, addr, size, offset, out_addr, deallocate) register partition_t part; #ifdef CHECKSUM vm_size_t original_size = size; -#endif CHECKSUM +#endif /* CHECKSUM */ vm_offset_t original_offset = offset; /* @@ -1638,7 +1638,7 @@ ddprintf ("default_read(%x,%x,%x,%d)\n",addr,size,offset,block.block.p_index); original_offset, write_checksum, read_checksum); } } -#endif CHECKSUM +#endif /* CHECKSUM */ return (PAGER_SUCCESS); } @@ -1673,7 +1673,7 @@ default_write(ds, addr, size, offset) checksum = compute_checksum(addr, size); pager_put_checksum(ds, offset, checksum); } -#endif CHECKSUM +#endif /* CHECKSUM */ offset = ptoa(block.block.p_offset); ddprintf ("default_write(%x,%x,%x,%d)\n",addr,size,offset,block.block.p_index); part = partition_of(block.block.p_index); @@ -2606,7 +2606,7 @@ seqnos_memory_object_data_initialize(pager, seqno, pager_request, #ifdef lint pager_request++; -#endif lint +#endif /* lint */ ds = pager_port_lookup(pager); if (ds == DEFAULT_PAGER_NULL) @@ -2670,7 +2670,7 @@ seqnos_memory_object_data_write(pager, seqno, pager_request, #ifdef lint pager_request++; -#endif lint +#endif /* lint */ ddprintf ("seqnos_memory_object_data_write <%p>: 1\n", &err); if ((data_cnt % vm_page_size) != 0) @@ -2773,7 +2773,7 @@ seqnos_memory_object_lock_completed(pager, seqno, pager_request, { #ifdef lint pager++; seqno++; pager_request++; offset++; length++; -#endif lint +#endif /* lint */ panic("%slock_completed",my_name); return(KERN_FAILURE); diff --git a/serverboot/load.c b/serverboot/load.c index fc16baf1..1665868b 100644 --- a/serverboot/load.c +++ b/serverboot/load.c @@ -333,7 +333,7 @@ boot_script_exec_cmd (task_t user_task, st.image_size); } } -#endif GZIP +#endif /* GZIP */ #ifdef BZIP2 if (result) { @@ -358,7 +358,7 @@ boot_script_exec_cmd (task_t user_task, st.image_size); } } -#endif BZIP2 +#endif /* BZIP2 */ if (result) panic ("cannot load %s: %s", namebuf, strerror (result)); #if 0 diff --git a/serverboot/queue.h b/serverboot/queue.h index 3e93476f..00619174 100644 --- a/serverboot/queue.h +++ b/serverboot/queue.h @@ -1,18 +1,18 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU @@ -313,4 +313,4 @@ typedef struct queue_entry *queue_entry_t; -#endif _QUEUE_H_ +#endif /* _QUEUE_H_ */ -- cgit v1.2.3