d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove parameter names from function prototypes (at least one collided

Browse Source 
with stdlib.h).

discussed with: phk
This commit is contained in:
Chad David 2002-11-11 18:55:57 +00:00
parent 33fb5c1dbf
commit 8ff8da756b
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/libdisk/libdisk.h
View File

@ -147,70 +147,69 @@ struct chunk {
#define DELCHUNK_RECOVER 0x0001 #define DELCHUNK_RECOVER 0x0001
const char *chunk_name(chunk_e type); const char *chunk_name(chunk_e);
const char * const char *
slice_type_name( int type, int subtype ); slice_type_name(int, int);
/* "chunk_n" for subtypes too /* "chunk_n" for subtypes too
*/ */
struct disk * struct disk *
Open_Disk(const char *devname); Open_Disk(const char *);
/* Will open the named disk, and return populated tree. /* Will open the named disk, and return populated tree.
*/ */
void void
Free_Disk(struct disk *disk); Free_Disk(struct disk *);
/* Free a tree made with Open_Disk() or Clone_Disk() /* Free a tree made with Open_Disk() or Clone_Disk()
*/ */
void void
Debug_Disk(struct disk *disk); Debug_Disk(struct disk *);
/* Print the content of the tree to stdout /* Print the content of the tree to stdout
*/ */
void void
Set_Bios_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects); Set_Bios_Geom(struct disk *, u_long, u_long, u_long);
/* Set the geometry the bios uses. /* Set the geometry the bios uses.
*/ */
void void
Sanitize_Bios_Geom(struct disk *disk); Sanitize_Bios_Geom(struct disk *);
/* Set the bios geometry to something sane /* Set the bios geometry to something sane
*/ */
int int
Insert_Chunk(struct chunk *c2, u_long offset, u_long size, const char *name, Insert_Chunk(struct chunk *, u_long, u_long, const char *, chunk_e, int,
chunk_e type, int subtype, u_long flags, const char *sname); u_long, const char *);
int int
Delete_Chunk2(struct disk *disk, struct chunk *, int flags); Delete_Chunk2(struct disk *, struct chunk *, int);
/* Free a chunk of disk_space modified by the passed /* Free a chunk of disk_space modified by the passed
* flags. * flags.
*/ */
int int
Delete_Chunk(struct disk *disk, struct chunk *); Delete_Chunk(struct disk *, struct chunk *);
/* Free a chunk of disk_space /* Free a chunk of disk_space
*/ */
void void
Collapse_Disk(struct disk *disk); Collapse_Disk(struct disk *);
/* Experimental, do not use. /* Experimental, do not use.
*/ */
int int
Collapse_Chunk(struct disk *disk, struct chunk *chunk); Collapse_Chunk(struct disk *, struct chunk *);
/* Experimental, do not use. /* Experimental, do not use.
*/ */
int int
Create_Chunk(struct disk *disk, u_long offset, u_long size, chunk_e type, Create_Chunk(struct disk *, u_long, u_long, chunk_e, int, u_long, const char *);
int subtype, u_long flags, const char *);
/* Create a chunk with the specified paramters /* Create a chunk with the specified paramters
*/ */
void void
All_FreeBSD(struct disk *d, int force_all); All_FreeBSD(struct disk *, int);
/* Make one FreeBSD chunk covering the entire disk; /* Make one FreeBSD chunk covering the entire disk;
* if force_all is set, bypass all BIOS geometry * if force_all is set, bypass all BIOS geometry
* considerations. * considerations.
@ -229,65 +228,65 @@ Disk_Names(void);
#ifdef PC98 #ifdef PC98
void void
Set_Boot_Mgr(struct disk *d, const u_char *bootipl, const size_t bootipl_size, Set_Boot_Mgr(struct disk *, const u_char *, const size_t, const u_char *,
const u_char *bootmenu, const size_t bootmenu_size); const size_t);
#else #else
void void
Set_Boot_Mgr(struct disk *d, const u_char *bootmgr, const size_t bootmgr_size); Set_Boot_Mgr(struct disk *, const u_char *, const size_t);
#endif #endif
/* Use this boot-manager on this disk. Gets written when Write_Disk() /* Use this boot-manager on this disk. Gets written when Write_Disk()
* is called * is called
*/ */
int int
Set_Boot_Blocks(struct disk *d, const u_char *_boot1, const u_char *_boot2); Set_Boot_Blocks(struct disk *, const u_char *, const u_char *);
/* Use these boot-blocks on this disk. Gets written when Write_Disk() /* Use these boot-blocks on this disk. Gets written when Write_Disk()
* is called. Returns nonzero upon failure. * is called. Returns nonzero upon failure.
*/ */
int int
Write_Disk(const struct disk *d); Write_Disk(const struct disk *);
/* Write all the MBRs, disklabels, bootblocks and boot managers /* Write all the MBRs, disklabels, bootblocks and boot managers
*/ */
u_long u_long
Next_Cyl_Aligned(const struct disk *d, u_long offset); Next_Cyl_Aligned(const struct disk *, u_long);
/* Round offset up to next cylinder according to the bios-geometry /* Round offset up to next cylinder according to the bios-geometry
*/ */
u_long u_long
Prev_Cyl_Aligned(const struct disk *d, u_long offset); Prev_Cyl_Aligned(const struct disk *, u_long);
/* Round offset down to previous cylinder according to the bios- /* Round offset down to previous cylinder according to the bios-
* geometry * geometry
*/ */
int int
Track_Aligned(const struct disk *d, u_long offset); Track_Aligned(const struct disk *, u_long);
/* Check if offset is aligned on a track according to the /* Check if offset is aligned on a track according to the
* bios geometry * bios geometry
*/ */
u_long u_long
Next_Track_Aligned(const struct disk *d, u_long offset); Next_Track_Aligned(const struct disk *, u_long);
/* Round offset up to next track according to the bios-geometry /* Round offset up to next track according to the bios-geometry
*/ */
u_long u_long
Prev_Track_Aligned(const struct disk *d, u_long offset); Prev_Track_Aligned(const struct disk *, u_long);
/* Check if offset is aligned on a track according to the /* Check if offset is aligned on a track according to the
* bios geometry * bios geometry
*/ */
struct chunk * struct chunk *
Create_Chunk_DWIM(struct disk *d, const struct chunk *parent , u_long size, Create_Chunk_DWIM(struct disk *, const struct chunk *, u_long, chunk_e, int,
chunk_e type, int subtype, u_long flags); u_long);
/* This one creates a partition inside the given parent of the given /* This one creates a partition inside the given parent of the given
* size, and returns a pointer to it. The first unused chunk big * size, and returns a pointer to it. The first unused chunk big
* enough is used. * enough is used.
*/ */
char * char *
ShowChunkFlags(struct chunk *c); ShowChunkFlags(struct chunk *);
/* Return string to show flags. */ /* Return string to show flags. */
/* /*
@ -295,17 +294,19 @@ ShowChunkFlags(struct chunk *c);
*/ */
struct disklabel; struct disklabel;
void Fill_Disklabel(struct disklabel *dl, const struct disk *new, const struct disk *old, const struct chunk *c1); void Fill_Disklabel(struct disklabel *, const struct disk *,
const struct disk *, const struct chunk *);
void Debug_Chunk(struct chunk *); void Debug_Chunk(struct chunk *);
void Free_Chunk(struct chunk *); void Free_Chunk(struct chunk *);
struct chunk * Clone_Chunk(const struct chunk *); struct chunk *Clone_Chunk(const struct chunk *);
int Add_Chunk(struct disk *, long, u_long, const char *, chunk_e, int, u_long, const char *); int Add_Chunk(struct disk *, long, u_long, const char *, chunk_e, int, u_long,
void * read_block(int, daddr_t, u_long); const char *);
void *read_block(int, daddr_t, u_long);
int write_block(int, daddr_t, const void *, u_long); int write_block(int, daddr_t, const void *, u_long);
struct disklabel * read_disklabel(int, daddr_t, u_long); struct disklabel *read_disklabel(int, daddr_t, u_long);
struct disk * Int_Open_Disk(const char *name); struct disk *Int_Open_Disk(const char *);
int Fixup_Names(struct disk *); int Fixup_Names(struct disk *);
int MakeDevChunk(const struct chunk *c1, const char *path); int MakeDevChunk(const struct chunk *, const char *);
__END_DECLS __END_DECLS
#define dprintf printf #define dprintf printf