diff options
| author | Ben Cressey <bcressey@amazon.com> | 2013-09-06 12:52:06 -0700 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-10 10:55:10 +0100 |
| commit | 319e8ee03c88002cf7a3f4da49b3ecbc29eb698e (patch) | |
| tree | 6245ac401ad909fe7d25e3df5876420f64b36bdc /extras | |
| parent | 83789acac046c93170f00c1c8fc2c1452ff315a1 (diff) | |
| download | xen-319e8ee03c88002cf7a3f4da49b3ecbc29eb698e.tar.gz xen-319e8ee03c88002cf7a3f4da49b3ecbc29eb698e.tar.bz2 xen-319e8ee03c88002cf7a3f4da49b3ecbc29eb698e.zip | |
minios: clean up unneeded "err = NULL" in frontend drivers
This patch removes cases where the error message pointer is already
NULL and is then set to NULL. These are harmless, but suggest
incorrect practice: the pointer should be passed to free() to
deallocate memory prior to reassignment. There are no functional
changes in this patch.
Signed-off-by: Ben Cressey <bcressey@amazon.com>
Reviewed-by: Matt Wilson <msw@amazon.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
[msw: split a larger patch from Ben into this cleanup patch]
Signed-off-by: Matt Wilson <msw@amazon.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/blkfront.c | 1 | ||||
| -rw-r--r-- | extras/mini-os/fbfront.c | 3 | ||||
| -rw-r--r-- | extras/mini-os/netfront.c | 1 | ||||
| -rw-r--r-- | extras/mini-os/pcifront.c | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 73837f65b7..dd5e95f295 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -289,7 +289,6 @@ void shutdown_blkfront(struct blkfront_dev *dev) XenbusStateInitialising, err); goto close; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 9148496953..8b4466a590 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -272,7 +272,6 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) XenbusStateInitialising, err); goto close_kbdfront; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); @@ -664,8 +663,6 @@ void shutdown_fbfront(struct fbfront_dev *dev) XenbusStateInitialising, err); goto close_fbfront; } - - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 7947fc256b..dc29f14075 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -541,7 +541,6 @@ void shutdown_netfront(struct netfront_dev *dev) XenbusStateInitialising, err); goto close; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index e6a5f4e7bf..df300b5a4e 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -355,7 +355,6 @@ void shutdown_pcifront(struct pcifront_dev *dev) XenbusStateInitialising, err); goto close_pcifront; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); |