From 9ec6e95b046de71c0198cb9d17acc5462dc76c74 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 29 Jul 2014 15:47:41 +0200 Subject: udev: place opening { at the same line as the function declaration --- src/udev/udev-builtin-path_id.c | 42 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) (limited to 'src/udev/udev-builtin-path_id.c') diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index 3ca59e0113..ac0f71f83e 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -33,8 +33,7 @@ #include "udev.h" _printf_(2,3) -static int path_prepend(char **path, const char *fmt, ...) -{ +static int path_prepend(char **path, const char *fmt, ...) { va_list va; char *pre; int err = 0; @@ -65,8 +64,7 @@ out: ** Linux only supports 32 bit luns. ** See drivers/scsi/scsi_scan.c::scsilun_to_int() for more details. */ -static int format_lun_number(struct udev_device *dev, char **path) -{ +static int format_lun_number(struct udev_device *dev, char **path) { unsigned long lun = strtoul(udev_device_get_sysnum(dev), NULL, 10); /* address method 0, peripheral device addressing with bus id of zero */ @@ -76,8 +74,7 @@ static int format_lun_number(struct udev_device *dev, char **path) return path_prepend(path, "lun-0x%04lx%04lx00000000", lun & 0xffff, (lun >> 16) & 0xffff); } -static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys) -{ +static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys) { struct udev_device *parent = dev; while (parent != NULL) { @@ -92,8 +89,7 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s return dev; } -static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent, char **path) { struct udev *udev = udev_device_get_udev(parent); struct udev_device *targetdev; struct udev_device *fcdev = NULL; @@ -122,8 +118,7 @@ out: return parent; } -static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **path) { struct udev *udev = udev_device_get_udev(parent); struct udev_device *targetdev; struct udev_device *target_parent; @@ -159,8 +154,7 @@ out: return parent; } -static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **path) { struct udev *udev = udev_device_get_udev(parent); struct udev_device *transportdev; struct udev_device *sessiondev = NULL; @@ -218,8 +212,7 @@ out: return parent; } -static struct udev_device *handle_scsi_default(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_scsi_default(struct udev_device *parent, char **path) { struct udev_device *hostdev; int host, bus, target, lun; const char *name; @@ -339,8 +332,7 @@ static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char * return parent; } -static struct udev_device *handle_scsi(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_scsi(struct udev_device *parent, char **path) { const char *devtype; const char *name; const char *id; @@ -401,8 +393,7 @@ out: return parent; } -static struct udev_device *handle_cciss(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_cciss(struct udev_device *parent, char **path) { const char *str; unsigned int controller, disk; @@ -415,8 +406,7 @@ static struct udev_device *handle_cciss(struct udev_device *parent, char **path) return parent; } -static void handle_scsi_tape(struct udev_device *dev, char **path) -{ +static void handle_scsi_tape(struct udev_device *dev, char **path) { const char *name; /* must be the last device in the syspath */ @@ -430,8 +420,7 @@ static void handle_scsi_tape(struct udev_device *dev, char **path) path_prepend(path, "st%c", name[2]); } -static struct udev_device *handle_usb(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_usb(struct udev_device *parent, char **path) { const char *devtype; const char *str; const char *port; @@ -453,8 +442,7 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path) return parent; } -static struct udev_device *handle_bcma(struct udev_device *parent, char **path) -{ +static struct udev_device *handle_bcma(struct udev_device *parent, char **path) { const char *sysname; unsigned int core; @@ -466,8 +454,7 @@ static struct udev_device *handle_bcma(struct udev_device *parent, char **path) return parent; } -static struct udev_device *handle_ccw(struct udev_device *parent, struct udev_device *dev, char **path) -{ +static struct udev_device *handle_ccw(struct udev_device *parent, struct udev_device *dev, char **path) { struct udev_device *scsi_dev; scsi_dev = udev_device_get_parent_with_subsystem_devtype(dev, "scsi", "scsi_device"); @@ -491,8 +478,7 @@ out: return parent; } -static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool test) -{ +static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool test) { struct udev_device *parent; char *path = NULL; bool some_transport = false; -- cgit v1.2.3-54-g00ecf