| Message ID | 1285267652-24454-1-git-send-email-weil@mail.berlios.de |
|---|---|
| State | New |
| Headers | show |
Thanks, applied. On Thu, Sep 23, 2010 at 6:47 PM, Stefan Weil <weil@mail.berlios.de> wrote: > Additional changes: > > * Removed 'extern' from drive_add (avoids too long line). > * Removed 'extern' from other functions (makes declarations > consistent with others in same header file). > > Cc: Blue Swirl <blauwirbel@gmail.com> > Cc: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > blockdev.h | 15 +++++++-------- > 1 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/blockdev.h b/blockdev.h > index 89dcd9a..653affc 100644 > --- a/blockdev.h > +++ b/blockdev.h > @@ -34,14 +34,13 @@ struct DriveInfo { > #define MAX_IDE_DEVS 2 > #define MAX_SCSI_DEVS 7 > > -extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); > -extern int drive_get_max_bus(BlockInterfaceType type); > -extern void drive_uninit(DriveInfo *dinfo); > -extern DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); > - > -extern QemuOpts *drive_add(const char *file, const char *fmt, ...); > -extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, > - int *fatal_error); > +DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); > +int drive_get_max_bus(BlockInterfaceType type); > +void drive_uninit(DriveInfo *dinfo); > +DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); > + > +QemuOpts *drive_add(const char *file, const char *fmt, ...) GCC_FMT_ATTR(2, 3); > +DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, int *fatal_error); > > /* device-hotplug */ > > -- > 1.7.1 > >
diff --git a/blockdev.h b/blockdev.h index 89dcd9a..653affc 100644 --- a/blockdev.h +++ b/blockdev.h @@ -34,14 +34,13 @@ struct DriveInfo { #define MAX_IDE_DEVS 2 #define MAX_SCSI_DEVS 7 -extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); -extern int drive_get_max_bus(BlockInterfaceType type); -extern void drive_uninit(DriveInfo *dinfo); -extern DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); - -extern QemuOpts *drive_add(const char *file, const char *fmt, ...); -extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, - int *fatal_error); +DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); +int drive_get_max_bus(BlockInterfaceType type); +void drive_uninit(DriveInfo *dinfo); +DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); + +QemuOpts *drive_add(const char *file, const char *fmt, ...) GCC_FMT_ATTR(2, 3); +DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, int *fatal_error); /* device-hotplug */
Additional changes: * Removed 'extern' from drive_add (avoids too long line). * Removed 'extern' from other functions (makes declarations consistent with others in same header file). Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- blockdev.h | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)