From: Ivan Maidanski Date: Thu, 22 Dec 2011 09:08:10 +0000 (+0400) Subject: Remove trailing spaces at EOLn in all files X-Git-Tag: gc7_3alpha2~280 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dd56eb49583be85fa44b9975fd63b0df85e8c15;p=gc Remove trailing spaces at EOLn in all files --- diff --git a/Mac_files/MacOS_Test_config.h b/Mac_files/MacOS_Test_config.h index 4e5d2527..c9609be5 100644 --- a/Mac_files/MacOS_Test_config.h +++ b/Mac_files/MacOS_Test_config.h @@ -1,14 +1,14 @@ /* MacOS_Test_config.h - + Configuration flags for Macintosh development systems. - + Test version. - + 11/16/95 pcb Updated compilation flags to reflect latest 4.6 Makefile. - + by Patrick C. Beard. */ /* Boehm, November 17, 1995 12:05 pm PST */ @@ -70,7 +70,7 @@ // is normally more than one byte due to alignment constraints.) // -DDONT_ADD_BYTE_AT_END disables the padding. // -DNO_SIGNALS does not disable signals during critical parts of -// the GC process. This is no less correct than many malloc +// the GC process. This is no less correct than many malloc // implementations, and it sometimes has a significant performance // impact. However, it is dangerous for many not-quite-ANSI C // programs that call things like printf in asynchronous signal handlers. diff --git a/Mac_files/MacOS_config.h b/Mac_files/MacOS_config.h index 407bdf15..838445d2 100644 --- a/Mac_files/MacOS_config.h +++ b/Mac_files/MacOS_config.h @@ -1,12 +1,12 @@ /* MacOS_config.h - + Configuration flags for Macintosh development systems. - + - + 11/16/95 pcb Updated compilation flags to reflect latest 4.6 Makefile. - + by Patrick C. Beard. */ /* Boehm, November 17, 1995 12:10 pm PST */ @@ -68,7 +68,7 @@ // is normally more than one byte due to alignment constraints.) // -DDONT_ADD_BYTE_AT_END disables the padding. // -DNO_SIGNALS does not disable signals during critical parts of -// the GC process. This is no less correct than many malloc +// the GC process. This is no less correct than many malloc // implementations, and it sometimes has a significant performance // impact. However, it is dangerous for many not-quite-ANSI C // programs that call things like printf in asynchronous signal handlers. diff --git a/Mac_files/dataend.c b/Mac_files/dataend.c index a3e3fe84..09d47b39 100644 --- a/Mac_files/dataend.c +++ b/Mac_files/dataend.c @@ -1,8 +1,8 @@ /* dataend.c - + A hack to get the extent of global data for the Macintosh. - + by Patrick C. Beard. */ diff --git a/Mac_files/datastart.c b/Mac_files/datastart.c index a9e0dd59..ec9f9af7 100644 --- a/Mac_files/datastart.c +++ b/Mac_files/datastart.c @@ -1,8 +1,8 @@ /* datastart.c - + A hack to get the extent of global data for the Macintosh. - + by Patrick C. Beard. */ diff --git a/cord/tests/de_win.rc b/cord/tests/de_win.rc index be0b925f..3d1c59fb 100644 --- a/cord/tests/de_win.rc +++ b/cord/tests/de_win.rc @@ -24,7 +24,7 @@ BEGIN END -DE MENU +DE MENU BEGIN POPUP "&File" BEGIN @@ -46,19 +46,19 @@ BEGIN MENUITEM "Delete F&orward\tDEL", IDM_EDITDEL MENUITEM "&Top\t^T", IDM_EDITTOP END - + POPUP "&Help" BEGIN MENUITEM "&Contents", IDM_HELPCONTENTS MENUITEM "&About...", IDM_HELPABOUT END - + MENUITEM "Page_&Down", IDM_EDITPDOWN MENUITEM "Page_&Up", IDM_EDITPUP END -DE ACCELERATORS +DE ACCELERATORS BEGIN "^R", IDM_EDITREPEAT "^N", IDM_EDITDOWN @@ -73,4 +73,3 @@ END /* DE ICON cord\de_win.ICO */ - diff --git a/doc/README.sgi b/doc/README.sgi index 7bdb50a4..d9e98938 100644 --- a/doc/README.sgi +++ b/doc/README.sgi @@ -15,7 +15,7 @@ Pthreads support is provided. This requires that: 1) You compile the collector with -DGC_IRIX_THREADS specified in the Makefile. -2) You have the latest pthreads patches installed. +2) You have the latest pthreads patches installed. (Though the collector makes only documented pthread calls, it relies on signal/threads interactions working just right in ways @@ -38,4 +38,3 @@ performance with the collector. (Increasing the heap size may help.) 6) The collector should not be compiled with -DREDIRECT_MALLOC. This confuses some library calls made by the pthreads implementation, which expect the standard malloc. - diff --git a/doc/debugging.html b/doc/debugging.html index 4db5f2a5..cc51d7f3 100644 --- a/doc/debugging.html +++ b/doc/debugging.html @@ -82,7 +82,7 @@ void * big_realloc(void *p, size_t new_size) { size_t old_size = GC_size(p); void * result; - + if (new_size <= 10000) return(GC_realloc(p, new_size)); if (new_size <= old_size) return(p); result = GC_malloc_ignore_off_page(new_size); @@ -303,7 +303,3 @@ the collector can avoid scanning them. - - - - diff --git a/doc/gc.man b/doc/gc.man index 109aca6c..ef159289 100644 --- a/doc/gc.man +++ b/doc/gc.man @@ -77,7 +77,7 @@ Fully portable code should call GC_INIT from the main program before making any other GC calls. On most platforms this does nothing and the collector is initialized on first use. -On a few platforms explicit initialization is necessary. And it can never hurt. +On a few platforms explicit initialization is necessary. And it can never hurt. .LP Debugging versions of many of the above routines are provided as macros. Their names are identical to the above, but consist of all capital letters. If GC_DEBUG is defined before gc.h is included, these routines do additional checking, and allow the leak detecting version of the collector to produce slightly more useful output. Without GC_DEBUG defined, they behave exactly like the lower-case versions. .LP diff --git a/doc/gcdescr.html b/doc/gcdescr.html index be83c1d1..08ca2a8f 100644 --- a/doc/gcdescr.html +++ b/doc/gcdescr.html @@ -168,7 +168,7 @@ fragmentation. In particular:
  • Programs with a large root set size and little live heap memory will expand the heap to amortize the cost of -scanning the roots. +scanning the roots.
  • Versions 5.x of the collector actually collect more frequently in nonincremental mode. The large block allocator usually refuses to split large heap blocks once the garbage collection threshold is @@ -218,7 +218,7 @@ between DATASTART and DATAEND, as defined in gcconfig.h. However, in most cases, this will also involve static data regions associated with dynamic libraries. These are identified by the mostly platform-specific code in dyn_load.c. -
+ The marker maintains an explicit stack of memory regions that are known to be accessible, but that have not yet been searched for contained pointers. Each stack entry contains the starting address of the block to be scanned, @@ -393,7 +393,7 @@ Both GC_register_disappearing_link and table. The hash table is allocated out of collected memory, but the reference to the finalizable object is hidden from the collector. Currently finalization requests are processed non-incrementally at the -end of a mark cycle. +end of a mark cycle.

The collector makes an initial pass over the table of finalizable objects, pushing the contents of unmarked objects onto the mark stack. @@ -479,7 +479,7 @@ may actually be better with mprotect and signals.) (PCR_VDB) By relying on an external dirty bit implementation, in this case the one in Xerox PCR.

  • -(DEFAULT_VDB) By treating all pages as dirty. This is the default if +(DEFAULT_VDB) By treating all pages as dirty. This is the default if none of the other techniques is known to be usable, and GC_malloc_stubborn is not used. Practical only for testing, or if the vast majority of objects use GC_malloc_stubborn. @@ -499,7 +499,7 @@ to a currently unallocated page inside the heap. Pages that have been the targets of such near misses are likely to be the targets of misidentified ``pointers'' in the future. To minimize the future damage caused by such misidentifications they will be allocated only to -small pointerfree objects. +small pointerfree objects.

    The collector understands two different kinds of black-listing. A page may be black listed for interior pointer references diff --git a/doc/gcinterface.html b/doc/gcinterface.html index ea6dfc5e..a9faee15 100644 --- a/doc/gcinterface.html +++ b/doc/gcinterface.html @@ -127,7 +127,7 @@ suitable support in the garbage collector (Linux and most Unix versions, win32 if the collector was suitably built) or if "stubborn" allocation is used (see gc.h). -On many platforms this interacts poorly with system calls +On many platforms this interacts poorly with system calls that write to the garbage collected heap.

    GC_warn_proc GC_set_warn_proc(GC_warn_proc p)
    @@ -226,7 +226,7 @@ allocator implementation in gc_allocator.h. It defines
  • gc_allocator which may be used either directly to allocate memory or to instantiate -container templates. +container templates. The former allocates uncollectable but traced memory. The latter allocates garbage-collected memory.

    @@ -263,7 +263,7 @@ memory, making it safe to refer to collectable objects from the resulting memory.

    C interface
    -It is also possible to use the C interface from +It is also possible to use the C interface from gc.h directly. On platforms which use malloc to implement ::new, it should usually be possible to use a version of the collector that has been compiled as a malloc diff --git a/doc/overview.html b/doc/overview.html index d31f9370..564ec3e8 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -94,7 +94,7 @@ simply by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc calls, and removing free calls. Exceptions are discussed -in issues.html. +in issues.html.

    Platforms

    The collector is not completely portable, but the distribution includes ports to most standard PC and UNIX/Linux platforms. @@ -442,5 +442,5 @@ Comments and bug reports may also be sent to (Hans.Boehm@hp.com) or (boehm@acm.org), but the gc mailing list is usually preferred. - +

    diff --git a/doc/scale.html b/doc/scale.html index b9de2e40..feb14f13 100644 --- a/doc/scale.html +++ b/doc/scale.html @@ -31,7 +31,7 @@ outperforms native queue-based mutual exclusion implementations in most cases, sometimes drastically so.

    Options for enhanced scalability

    Version 6.0 of the collector adds two facilities to enhance collector -scalability on multiprocessors. As of 6.0alpha1, these are supported +scalability on multiprocessors. As of 6.0alpha1, these are supported only under Linux on X86 and IA64 processors, though ports to other otherwise supported Pthreads platforms should be straightforward. They are intended to be used together. @@ -60,7 +60,7 @@ with that returned by the standard allocators. It may be used by other threads. The only difference is that, if the thread allocates enough memory of a certain kind, it will build a thread-local free list for objects of that kind, and allocate from that. This greatly reduces -locking. The thread-local free lists are refilled using +locking. The thread-local free lists are refilled using GC_malloc_many.

    An important side effect of this flag is to replace the default @@ -129,7 +129,7 @@ Note that setting GC_NPROCS to 1 also causes some lock acquisitions inside the collector to immediately yield the processor instead of busy waiting first. In the case of a multiprocessor and a client with multiple simultaneously runnable threads, this may have disastrous performance -consequences (e.g. a factor of 10 slowdown). +consequences (e.g. a factor of 10 slowdown).

    Performance

    We conducted some simple experiments with a version of our GC benchmark that was slightly modified to @@ -200,7 +200,7 @@ since the memory system is a major constraint for the garbage collector, the processors usually share a single memory bus, and thus the aggregate memory bandwidth does not increase in -proportion to the number of processors. +proportion to the number of processors.

    These results are likely to be very sensitive to both hardware and OS issues. Preliminary experiments with an older Pentium Pro machine running diff --git a/doc/tree.html b/doc/tree.html index c46a281c..e0cb09d7 100644 --- a/doc/tree.html +++ b/doc/tree.html @@ -49,7 +49,7 @@ The high bits are used as an index into the GC_top_index (really bottom_index data structure. This structure in turn consists mostly of an array index indexed by the middle bits of the candidate pointer. The index array contains the actual -hdr pointers. +hdr pointers.

    Thus a pointer lookup consists primarily of a handful of memory references, and can be quite fast: @@ -99,8 +99,8 @@ This was contributed by Dave Barrett several years ago. Data Structure used by GC_base in gc3.7: 21-Apr-94 - - + + 63 LOG_TOP_SZ[11] LOG_BOTTOM_SZ[10] LOG_HBLKSIZE[13] @@ -108,82 +108,82 @@ This was contributed by Dave Barrett several years ago. p:| | TL_HASH(hi) | | HBLKDISPL(p) | +------------------+----------------+------------------+------------------+ \-----------------------HBLKPTR(p)-------------------/ - \------------hi-------------------/ + \------------hi-------------------/ \______ ________/ \________ _______/ \________ _______/ V V V | | | - GC_top_index[] | | | - --- +--------------+ | | | - ^ | | | | | - | | | | | | - TOP +--------------+<--+ | | - _SZ +-<| [] | * | | -(items)| +--------------+ if 0 < bi< HBLKSIZE | | - | | | | then large object | | - | | | | starts at the bi'th | | - v | | | HBLK before p. | i | - --- | +--------------+ | (word- | - v | aligned) | - bi= |GET_BI(p){->hash_link}->key==hi | | - v | | - | (bottom_index) \ scratch_alloc'd | | - | ( struct bi ) / by get_index() | | - --- +->+--------------+ | | + GC_top_index[] | | | + --- +--------------+ | | | + ^ | | | | | + | | | | | | + TOP +--------------+<--+ | | + _SZ +-<| [] | * | | +(items)| +--------------+ if 0 < bi< HBLKSIZE | | + | | | | then large object | | + | | | | starts at the bi'th | | + v | | | HBLK before p. | i | + --- | +--------------+ | (word- | + v | aligned) | + bi= |GET_BI(p){->hash_link}->key==hi | | + v | | + | (bottom_index) \ scratch_alloc'd | | + | ( struct bi ) / by get_index() | | + --- +->+--------------+ | | ^ | | | | ^ | | | | BOTTOM | | ha=GET_HDR_ADDR(p) | | _SZ(items)+--------------+<----------------------+ +-------+ - | +--<| index[] | | - | | +--------------+ GC_obj_map: v - | | | | from / +-+-+-----+-+-+-+-+ --- - v | | | GC_add < 0| | | | | | | | ^ - --- | +--------------+ _map_entry \ +-+-+-----+-+-+-+-+ | + | +--<| index[] | | + | | +--------------+ GC_obj_map: v + | | | | from / +-+-+-----+-+-+-+-+ --- + v | | | GC_add < 0| | | | | | | | ^ + --- | +--------------+ _map_entry \ +-+-+-----+-+-+-+-+ | | | asc_link | +-+-+-----+-+-+-+-+ MAXOBJSZ - | +--------------+ +-->| | | j | | | | | +1 - | | key | | +-+-+-----+-+-+-+-+ | - | +--------------+ | +-+-+-----+-+-+-+-+ | - | | hash_link | | | | | | | | | | v + | +--------------+ +-->| | | j | | | | | +1 + | | key | | +-+-+-----+-+-+-+-+ | + | +--------------+ | +-+-+-----+-+-+-+-+ | + | | hash_link | | | | | | | | | | v | +--------------+ | +-+-+-----+-+-+-+-+ --- - | | |<--MAX_OFFSET--->| + | | |<--MAX_OFFSET--->| | | (bytes) -HDR(p)| GC_find_header(p) | |<--MAP_ENTRIES-->| - | \ from | =HBLKSIZE/WORDSZ +HDR(p)| GC_find_header(p) | |<--MAP_ENTRIES-->| + | \ from | =HBLKSIZE/WORDSZ | (hdr) (struct hblkhdr) / alloc_hdr() | (1024 on Alpha) +-->+----------------------+ | (8/16 bits each) -GET_HDR(p)| word hb_sz (words) | | - +----------------------+ | +GET_HDR(p)| word hb_sz (words) | | + +----------------------+ | | struct hblk *hb_next | | - +----------------------+ | + +----------------------+ | |mark_proc hb_mark_proc| | +----------------------+ | | char * hb_map |>-------------+ - +----------------------+ - | ushort hb_obj_kind | - +----------------------+ - | hb_last_reclaimed | - --- +----------------------+ + +----------------------+ + | ushort hb_obj_kind | + +----------------------+ + | hb_last_reclaimed | + --- +----------------------+ ^ | | MARK_BITS| hb_marks[] | *if hdr is free, hb_sz + DISCARD_WORDS _SZ(words)| | is the size of a heap chunk (struct hblk) v | | of at least MININCR*HBLKSIZE bytes (below), --- +----------------------+ otherwise, size of each object in chunk. -Dynamic data structures above are interleaved throughout the heap in blocks of +Dynamic data structures above are interleaved throughout the heap in blocks of size MININCR * HBLKSIZE bytes as done by gc_scratch_alloc which cannot be freed; free lists are used (e.g. alloc_hdr). HBLK's below are collected. - (struct hblk) + (struct hblk) --- +----------------------+ < HBLKSIZE --- --- DISCARD_ ^ |garbage[DISCARD_WORDS]| aligned ^ ^ HDR_BYTES WORDS | | | | v (bytes) (words) - | +-----hb_body----------+ < WORDSZ | --- --- + | +-----hb_body----------+ < WORDSZ | --- --- | | | aligned | ^ ^ | | Object 0 | | hb_sz | | | | i |(word- (words)| | | | (bytes)|aligned) v | | + - - - - - - - - - - -+ --- | --- | | | | ^ | ^ | - n * | | j (words) | hb_sz BODY_SZ + n * | | j (words) | hb_sz BODY_SZ HBLKSIZE | Object 1 | v v | (words) (bytes) | |--------------- v MAX_OFFSET | + - - - - - - - - - - -+ --- (bytes) diff --git a/extra/AmigaOS.c b/extra/AmigaOS.c index d1715039..759b3dfb 100644 --- a/extra/AmigaOS.c +++ b/extra/AmigaOS.c @@ -43,7 +43,7 @@ ptr_t GC_get_main_stack_base() { struct Process *proc = (struct Process*)SysBase->ThisTask; - + /* Reference: Amiga Guru Book Pages: 42,567,574 */ if (proc->pr_Task.tc_Node.ln_Type==NT_PROCESS && proc->pr_CLI != NULL) { @@ -99,7 +99,7 @@ ptr_t GC_get_stack_base() struct CommandLineInterface *cli; BPTR myseglist; ULONG *data; - + int num; @@ -619,5 +619,3 @@ void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes){ } #endif //GC_AMIGA_AM - - diff --git a/extra/MacOS.c b/extra/MacOS.c index b56bea78..6cb5edb7 100644 --- a/extra/MacOS.c +++ b/extra/MacOS.c @@ -1,16 +1,16 @@ /* MacOS.c - + Some routines for the Macintosh OS port of the Hans-J. Boehm, Alan J. Demers garbage collector. - + - + 11/22/94 pcb StripAddress the temporary memory handle for 24-bit mode. 11/30/94 pcb Tracking all memory usage so we can deallocate it all at once. 02/10/96 pcb Added routine to perform a final collection when unloading shared library. - + by Patrick C. Beard. */ /* Boehm, February 15, 1996 2:55 pm PST */ @@ -79,7 +79,7 @@ Ptr GC_MacTemporaryNewPtr(size_t size, Boolean clearMemory) (**tempMemBlock).nextBlock = theTemporaryMemory; theTemporaryMemory = tempMemBlock; } - + # if !defined(SHARED_LIBRARY_BUILD) // install an exit routine to clean up the memory used at the end. if (firstTime) { @@ -87,17 +87,17 @@ Ptr GC_MacTemporaryNewPtr(size_t size, Boolean clearMemory) firstTime = false; } # endif - + return tempPtr; } -extern word GC_fo_entries; +extern word GC_fo_entries; static void perform_final_collection() { unsigned i; word last_fo_entries = 0; - + /* adjust the stack bottom, because CFM calls us from another stack location. */ GC_stackbottom = (ptr_t)&i; diff --git a/include/ec.h b/include/ec.h index c829b83a..3a1a2b01 100644 --- a/include/ec.h +++ b/include/ec.h @@ -47,7 +47,7 @@ typedef struct CORD_ec_struct { /* Note that this is almost the only real function, and it is */ /* implemented in 6 lines in cordxtra.c */ void CORD_ec_flush_buf(CORD_ec x); - + /* Convert an extensible cord to a cord. */ # define CORD_ec_to_cord(x) (CORD_ec_flush_buf(x), (x)[0].ec_cord) diff --git a/include/gc_tiny_fl.h b/include/gc_tiny_fl.h index 91b77fdf..9c9e8071 100644 --- a/include/gc_tiny_fl.h +++ b/include/gc_tiny_fl.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 1999-2005 Hewlett-Packard Development Company, L.P. * * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED @@ -20,7 +20,7 @@ * However, global free lists are known to the GC. "Tiny" free lists * are basically private to the client. Their contents are viewed as * "in use" and marked accordingly by the core of the GC. - * + * * Note that inlined code might know about the layout of these and the constants * involved. Thus any change here may invalidate clients, and such changes should * be avoided. Hence we keep this as simple as possible. diff --git a/pcr_interface.c b/pcr_interface.c index 77bddf80..a359b2da 100644 --- a/pcr_interface.c +++ b/pcr_interface.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. * * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED @@ -74,7 +74,7 @@ void GC_enumerate_block(struct hblk *h; enumerate_data * ed) word descr; # error This code was updated without testing. # error and its precursor was clearly broken. - + hhdr = HDR(h); descr = hhdr -> hb_descr; sz = hhdr -> hb_sz; @@ -99,7 +99,7 @@ PCR_ERes GC_EnumerateProc( ) { enumerate_data ed; - + ed.ed_proc = proc; ed.ed_pointerfree = ptrFree; ed.ed_fail_code = PCR_ERes_okay; diff --git a/src/ia64_save_regs_in_stack.s b/src/ia64_save_regs_in_stack.s index 3b18c084..2b81edfa 100644 --- a/src/ia64_save_regs_in_stack.s +++ b/src/ia64_save_regs_in_stack.s @@ -9,4 +9,3 @@ GC_save_regs_in_stack: mov r8=ar.bsp br.ret.sptk.few rp .endp GC_save_regs_in_stack - diff --git a/src/sparc_netbsd_mach_dep.s b/src/sparc_netbsd_mach_dep.s index bc3f1603..14feb15e 100644 --- a/src/sparc_netbsd_mach_dep.s +++ b/src/sparc_netbsd_mach_dep.s @@ -15,7 +15,7 @@ _C_LABEL(GC_push_regs): mov %sp,%o0 retl nop - + .globl _C_LABEL(GC_clear_stack_inner) _C_LABEL(GC_clear_stack_inner): mov %sp,%o2 ! Save sp diff --git a/src/sparc_sunos4_mach_dep.s b/src/sparc_sunos4_mach_dep.s index 41858073..923f5eaa 100644 --- a/src/sparc_sunos4_mach_dep.s +++ b/src/sparc_sunos4_mach_dep.s @@ -13,7 +13,7 @@ _GC_push_regs: mov %sp,%o0 retl nop - + .globl _GC_clear_stack_inner _GC_clear_stack_inner: mov %sp,%o2 ! Save sp @@ -30,9 +30,3 @@ loop: add %o3,-8,%o3 ! p -= 8 (delay slot) retl mov %o2,%sp ! Restore sp., delay slot - - - - - - diff --git a/tools/add_gc_prefix.c b/tools/add_gc_prefix.c index a7fd4fc4..ecf4ff45 100644 --- a/tools/add_gc_prefix.c +++ b/tools/add_gc_prefix.c @@ -1,13 +1,13 @@ # include # include - + int main(argc, argv, envp) int argc; char ** argv; char ** envp; { int i; - + for (i = 1; i < argc; i++) { if (GC_ALPHA_VERSION == GC_NOT_ALPHA) { printf("gc%d.%d/%s ", GC_VERSION_MAJOR, GC_VERSION_MINOR, argv[i]); diff --git a/tools/if_mach.c b/tools/if_mach.c index d6e0a70d..d3763b60 100644 --- a/tools/if_mach.c +++ b/tools/if_mach.c @@ -15,11 +15,10 @@ int main(int argc, char **argv, char **envp) fflush(stdout); execvp(argv[3], argv+3); perror("Couldn't execute"); - + Usage: fprintf(stderr, "Usage: %s mach_type os_type command\n", argv[0]); fprintf(stderr, "Currently mach_type = %s, os_type = %s\n", MACH_TYPE, OS_TYPE); return(1); } - diff --git a/tools/if_not_there.c b/tools/if_not_there.c index 7af6fba4..b71394c3 100644 --- a/tools/if_not_there.c +++ b/tools/if_not_there.c @@ -30,9 +30,8 @@ int main(int argc, char **argv, char **envp) fflush(stdout); execvp(argv[2], argv+2); exit(1); - + Usage: fprintf(stderr, "Usage: %s file_name command\n", argv[0]); return(1); } -