Re: [PATCH 1/5] utils: fix compilation with C++98

[Rosen Penev <rosenp@gmail.com>]

> On May 7, 2020, at 4:54 AM, Tomasz Figa <tfiga@chromium.org> wrote:
> 
> HI Rosen,
> 
>> On Thu, Apr 23, 2020 at 11:10 PM Rosen Penev <rosenp@gmail.com> wrote:
>> 
>> Signed-off-by: Rosen Penev <rosenp@gmail.com>
>> ---
>> utils/cec-compliance/cec-test.cpp | 4 ++--
>> utils/rds-ctl/rds-ctl.cpp         | 2 +-
>> utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 2 +-
>> 3 files changed, 4 insertions(+), 4 deletions(-)
>> 
> 
> First of all, thanks for the patch!
> 
> One question: In what case this file would end up being compiled in
> the C++98 mode?
-std=c++98 , using uClibc++.
> 
> Also, please see a comment inline.
> 
>> diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp
>> index 032ff5ad..cc07998a 100644
>> --- a/utils/cec-compliance/cec-test.cpp
>> +++ b/utils/cec-compliance/cec-test.cpp
>> @@ -908,7 +908,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte
>>                cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE);
>>                fail_on_test(!transmit_timeout(node, &msg));
>>                fail_on_test(timed_out_or_abort(&msg));
>> -               info = {};
>> +               memset(&info, 0, sizeof(info));
>>                cec_ops_tuner_device_status(&msg, &info);
>>                if (!memcmp(&info, &info_vec[0], sizeof(info)))
>>                        break;
>> @@ -935,7 +935,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte
>>                cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE);
>>                fail_on_test(!transmit_timeout(node, &msg));
>>                fail_on_test(timed_out_or_abort(&msg));
>> -               info = {};
>> +               memset(&info, 0, sizeof(info));
>>                cec_ops_tuner_device_status(&msg, &info);
>>                if (memcmp(&info, &(*iter), sizeof(info))) {
>>                        log_tuner_service(info);
>> diff --git a/utils/rds-ctl/rds-ctl.cpp b/utils/rds-ctl/rds-ctl.cpp
>> index 0511fe5d..0e497b2a 100644
>> --- a/utils/rds-ctl/rds-ctl.cpp
>> +++ b/utils/rds-ctl/rds-ctl.cpp
>> @@ -918,7 +918,7 @@ static void get_options(const int fd, const int capabilities, struct v4l2_freque
>>                                printf("\tFrequency range      : %.1f MHz - %.1f MHz\n",
>>                                         vt.rangelow / 16.0, vt.rangehigh / 16.0);
>>                        printf("\tSignal strength/AFC  : %ld%%/%d\n",
>> -                               std::lround(vt.signal / 655.35), vt.afc);
>> +                               lround(vt.signal / 655.25), vt.afc);
> 
> Why the change from .35 to .25?
This looks like a mistake.
> 
> Best regards,
> Tomasz
> 
>>                        printf("\tCurrent audio mode   : %s\n", audmode2s(vt.audmode));
>>                        printf("\tAvailable subchannels: %s\n",
>>                                        rxsubchans2s(vt.rxsubchans).c_str());
>> diff --git a/utils/v4l2-ctl/v4l2-ctl-tuner.cpp b/utils/v4l2-ctl/v4l2-ctl-tuner.cpp
>> index bc397ec2..73dc323c 100644
>> --- a/utils/v4l2-ctl/v4l2-ctl-tuner.cpp
>> +++ b/utils/v4l2-ctl/v4l2-ctl-tuner.cpp
>> @@ -423,7 +423,7 @@ void tuner_get(cv4l_fd &_fd)
>> 
>>                        if (vt.type != V4L2_TUNER_SDR && vt.type != V4L2_TUNER_RF) {
>>                                printf("\tSignal strength/AFC  : %ld%%/%d\n",
>> -                                      std::lround(vt.signal / 655.35), vt.afc);
>> +                                      lround(vt.signal / 655.35), vt.afc);
>>                                printf("\tCurrent audio mode   : %s\n", audmode2s(vt.audmode));
>>                                printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str());
>>                        }
>> --
>> 2.25.3
>>