| Message ID | 20190110172128.12484-1-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2,V2] lib: fwts_ac_adapter: fix readdir(ac_power_dir) failing | expand |
On 10/01/2019 17:21, Alex Hung wrote: > As readdir() returns next directory, the position of the directory > stream dirp needs to be reset by rewinddir(). > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/src/fwts_ac_adapter.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lib/src/fwts_ac_adapter.c b/src/lib/src/fwts_ac_adapter.c > index 9dd828f7..853cf222 100644 > --- a/src/lib/src/fwts_ac_adapter.c > +++ b/src/lib/src/fwts_ac_adapter.c > @@ -89,6 +89,7 @@ int fwts_ac_adapter_get_state(const int state, int *matching, int *not_matching) > (void)closedir(ac_power_dir); > return FWTS_ERROR; > } > + rewinddir(ac_power_dir); > > ac_interface = &fwts_ac_interfaces[SYS_INTERFACE]; > /* then try older /proc interface */ > Thanks Alex, Acked-by: Colin Ian King <colin.king@canonical.com>
On 1/11/19 1:21 AM, Alex Hung wrote: > As readdir() returns next directory, the position of the directory > stream dirp needs to be reset by rewinddir(). > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/src/fwts_ac_adapter.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lib/src/fwts_ac_adapter.c b/src/lib/src/fwts_ac_adapter.c > index 9dd828f7..853cf222 100644 > --- a/src/lib/src/fwts_ac_adapter.c > +++ b/src/lib/src/fwts_ac_adapter.c > @@ -89,6 +89,7 @@ int fwts_ac_adapter_get_state(const int state, int *matching, int *not_matching) > (void)closedir(ac_power_dir); > return FWTS_ERROR; > } > + rewinddir(ac_power_dir); > > ac_interface = &fwts_ac_interfaces[SYS_INTERFACE]; > /* then try older /proc interface */ Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/lib/src/fwts_ac_adapter.c b/src/lib/src/fwts_ac_adapter.c index 9dd828f7..853cf222 100644 --- a/src/lib/src/fwts_ac_adapter.c +++ b/src/lib/src/fwts_ac_adapter.c @@ -89,6 +89,7 @@ int fwts_ac_adapter_get_state(const int state, int *matching, int *not_matching) (void)closedir(ac_power_dir); return FWTS_ERROR; } + rewinddir(ac_power_dir); ac_interface = &fwts_ac_interfaces[SYS_INTERFACE]; /* then try older /proc interface */
As readdir() returns next directory, the position of the directory stream dirp needs to be reset by rewinddir(). Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/lib/src/fwts_ac_adapter.c | 1 + 1 file changed, 1 insertion(+)