On 20/10/16 10:19, Eva Rachel Retuya wrote:
> Replace the type of 'force' flag from int to bool and at the same time
> rename it to 'force_autochannels' for better readability.
>
> Suggested-by: Peter Meerwald-Stadler <pmeerw@xxxxxxxxxx>
> Signed-off-by: Eva Rachel Retuya <eraretuya@xxxxxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> tools/iio/iio_generic_buffer.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
> index 31ddd3a..8ef39ae 100644
> --- a/tools/iio/iio_generic_buffer.c
> +++ b/tools/iio/iio_generic_buffer.c
> @@ -348,7 +348,7 @@ int main(int argc, char **argv)
> int noevents = 0;
> int notrigger = 0;
> char *dummy;
> - int force = 0;
> + bool force_autochannels = false;
>
> struct iio_channel_info *channels = NULL;
>
> @@ -362,7 +362,7 @@ int main(int argc, char **argv)
> break;
> case 'A':
> autochannels = AUTOCHANNELS_ENABLED;
> - force = 1;
> + force_autochannels = true;
> break;
> case 'c':
> errno = 0;
> @@ -526,14 +526,15 @@ int main(int argc, char **argv)
> "diag %s\n", dev_dir_name);
> goto error;
> }
> - if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) && !force) {
> + if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) &&
> + !force_autochannels) {
> fprintf(stderr, "Auto-channels selected but some channels "
> "are already activated in sysfs\n");
> fprintf(stderr, "Proceeding without activating any channels\n");
> }
>
> if ((!num_channels && autochannels == AUTOCHANNELS_ENABLED) ||
> - ((autochannels == AUTOCHANNELS_ENABLED) && force)) {
> + ((autochannels == AUTOCHANNELS_ENABLED) && force_autochannels)) {
> fprintf(stderr, "Enabling all channels\n");
>
> ret = enable_disable_all_channels(dev_dir_name, 1);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
