[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v2 2/4] minios: clean up allocation of char arrays used for xenbus paths
On Fri, 2013-09-06 at 12:52 -0700, Matt Wilson wrote: > From: Matt Wilson <msw@xxxxxxxxxx> > > This patch cleans up instances of char array allocation where string > lengths were manually counted to use strlen() instead. There are no > functional changes in this patch. > > Signed-off-by: Matt Wilson <msw@xxxxxxxxxx> > Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> > Cc: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> Was briefly confused by missing that a +1 had gone when the "/" was incorporated into the string, but: Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> > --- > extras/mini-os/blkfront.c | 6 +++--- > extras/mini-os/console/xenbus.c | 4 ++-- > extras/mini-os/fbfront.c | 10 +++++----- > extras/mini-os/netfront.c | 4 ++-- > extras/mini-os/pcifront.c | 8 ++++---- > 5 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c > index 70976f5..73837f6 100644 > --- a/extras/mini-os/blkfront.c > +++ b/extras/mini-os/blkfront.c > @@ -99,7 +99,7 @@ struct blkfront_dev *init_blkfront(char *_nodename, struct > blkfront_info *info) > > struct blkfront_dev *dev; > > - char path[strlen(nodename) + 1 + 10 + 1]; > + char path[strlen(nodename) + strlen("/backend-id") + 1]; > > printk("******************* BLKFRONT for %s **********\n\n\n", nodename); > > @@ -189,7 +189,7 @@ done: > > { > XenbusState state; > - char path[strlen(dev->backend) + 1 + 19 + 1]; > + char path[strlen(dev->backend) + strlen("/feature-flush-cache") + 1]; > snprintf(path, sizeof(path), "%s/mode", dev->backend); > msg = xenbus_read(XBT_NIL, path, &c); > if (msg) { > @@ -253,7 +253,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) > char* err = NULL; > XenbusState state; > > - char path[strlen(dev->backend) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; > > blkfront_sync(dev); > diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c > index 1ecfcc5..23d4d32 100644 > --- a/extras/mini-os/console/xenbus.c > +++ b/extras/mini-os/console/xenbus.c > @@ -18,8 +18,8 @@ void free_consfront(struct consfront_dev *dev) > char* err = NULL; > XenbusState state; > > - char path[strlen(dev->backend) + 1 + 5 + 1]; > - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > + char nodename[strlen(dev->nodename) + strlen("/state") + 1]; > > snprintf(path, sizeof(path), "%s/state", dev->backend); > snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename); > diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c > index 6eddb3c..9148496 100644 > --- a/extras/mini-os/fbfront.c > +++ b/extras/mini-os/fbfront.c > @@ -75,7 +75,7 @@ struct kbdfront_dev *init_kbdfront(char *_nodename, int > abs_pointer) > char* nodename = _nodename ? _nodename : "device/vkbd/0"; > struct kbdfront_dev *dev; > > - char path[strlen(nodename) + 1 + 10 + 1]; > + char path[strlen(nodename) + strlen("/backend-id") + 1]; > > printk("******************* KBDFRONT for %s **********\n\n\n", nodename); > > @@ -239,7 +239,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) > char* err = NULL; > XenbusState state; > > - char path[strlen(dev->backend) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > char nodename[strlen(dev->nodename) + strlen("/request-abs-pointer") + > 1]; > > printk("close kbd: backend at %s\n",dev->backend); > @@ -413,7 +413,7 @@ struct fbfront_dev *init_fbfront(char *_nodename, > unsigned long *mfns, int width > unsigned long mapped; > char* nodename = _nodename ? _nodename : "device/vfb/0"; > > - char path[strlen(nodename) + 1 + 10 + 1]; > + char path[strlen(nodename) + strlen("/backend-id") + 1]; > > printk("******************* FBFRONT for %s **********\n\n\n", nodename); > > @@ -520,7 +520,7 @@ done: > > { > XenbusState state; > - char path[strlen(dev->backend) + 1 + 14 + 1]; > + char path[strlen(dev->backend) + strlen("/request-update") + 1]; > char frontpath[strlen(nodename) + strlen("/state") + 1]; > > snprintf(path, sizeof(path), "%s/state", dev->backend); > @@ -631,7 +631,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) > char* err = NULL; > XenbusState state; > > - char path[strlen(dev->backend) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > char nodename[strlen(dev->nodename) + strlen("/feature-update") + 1]; > > printk("close fb: backend at %s\n",dev->backend); > diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c > index ddf56ea..7947fc2 100644 > --- a/extras/mini-os/netfront.c > +++ b/extras/mini-os/netfront.c > @@ -441,7 +441,7 @@ done: > > { > XenbusState state; > - char path[strlen(dev->backend) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > snprintf(path, sizeof(path), "%s/state", dev->backend); > > xenbus_watch_path_token(XBT_NIL, path, path, &dev->events); > @@ -507,7 +507,7 @@ void shutdown_netfront(struct netfront_dev *dev) > char* err = NULL; > XenbusState state; > > - char path[strlen(dev->backend) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > char nodename[strlen(dev->nodename) + strlen("/request-rx-copy") + 1]; > > printk("close network: backend at %s\n",dev->backend); > diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c > index f9ae768..e6a5f4e 100644 > --- a/extras/mini-os/pcifront.c > +++ b/extras/mini-os/pcifront.c > @@ -149,7 +149,7 @@ struct pcifront_dev *init_pcifront(char *_nodename) > > struct pcifront_dev *dev; > > - char path[strlen(nodename) + 1 + 10 + 1]; > + char path[strlen(nodename) + strlen("/backend-id") + 1]; > > if (!_nodename && pcidev) > return pcidev; > @@ -237,8 +237,8 @@ done: > printk("backend at %s\n", dev->backend); > > { > - char path[strlen(dev->backend) + 1 + 5 + 1]; > - char frontpath[strlen(nodename) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > + char frontpath[strlen(nodename) + strlen("/state") + 1]; > XenbusState state; > snprintf(path, sizeof(path), "%s/state", dev->backend); > > @@ -322,7 +322,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) > char* err = NULL; > XenbusState state; > > - char path[strlen(dev->backend) + 1 + 5 + 1]; > + char path[strlen(dev->backend) + strlen("/state") + 1]; > char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; > > printk("close pci: backend at %s\n",dev->backend); _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |